diff options
Diffstat (limited to 'src')
107 files changed, 138 insertions, 138 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index a3cd15042..69f168aff 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -1,5 +1,5 @@ #include "global.h" -#include "abilities.h" +#include "constants/abilities.h" #include "battle.h" #include "battle_interface.h" #include "battle_setup.h" @@ -17,9 +17,9 @@ #include "rom3.h" #include "rom_8077ABC.h" #include "rom_8094928.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #include "task.h" #include "text.h" diff --git a/src/battle/battle_3.c b/src/battle/battle_3.c index 263eb2be5..05fd89d24 100644 --- a/src/battle/battle_3.c +++ b/src/battle/battle_3.c @@ -1,11 +1,11 @@ #include "global.h" -#include "abilities.h" +#include "constants/abilities.h" #include "battle.h" #include "moves.h" #include "item.h" #include "items.h" #include "hold_effects.h" -#include "species.h" +#include "constants/species.h" #include "pokemon.h" #include "data2.h" #include "random.h" diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 088f30669..ce9f55039 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -2,19 +2,19 @@ #include "battle.h" #include "battle_move_effects.h" #include "moves.h" -#include "abilities.h" +#include "constants/abilities.h" #include "item.h" #include "items.h" #include "data2.h" #include "hold_effects.h" #include "random.h" #include "rom3.h" -#include "species.h" +#include "constants/species.h" #include "pokemon.h" #include "text.h" #include "palette.h" #include "main.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "task.h" #include "decompress.h" diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c index 0728b4b71..5a30e012d 100644 --- a/src/battle/battle_7.c +++ b/src/battle/battle_7.c @@ -11,9 +11,9 @@ #include "pokemon.h" #include "rom_8077ABC.h" #include "rom_8094928.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #include "task.h" #include "text.h" diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c index 0348c3ccd..eab90376e 100644 --- a/src/battle/battle_ai.c +++ b/src/battle/battle_ai.c @@ -1,6 +1,6 @@ #include "global.h" #include "battle_ai.h" -#include "abilities.h" +#include "constants/abilities.h" #include "battle.h" #include "battle_move_effects.h" #include "data2.h" @@ -9,7 +9,7 @@ #include "pokemon.h" #include "random.h" #include "rom_8077ABC.h" -#include "species.h" +#include "constants/species.h" #include "util.h" #include "ewram.h" diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c index 88043c60d..3259fc7ee 100644 --- a/src/battle/battle_controller_linkopponent.c +++ b/src/battle/battle_controller_linkopponent.c @@ -8,7 +8,7 @@ #include "palette.h" #include "rom_8077ABC.h" #include "rom3.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "string_util.h" diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c index 3e6ea4add..fc3fde661 100644 --- a/src/battle/battle_controller_linkpartner.c +++ b/src/battle/battle_controller_linkpartner.c @@ -13,7 +13,7 @@ #include "rom3.h" #include "rom_8077ABC.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "sprite.h" #include "string_util.h" #include "task.h" diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index 4d4155419..a35687796 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -14,7 +14,7 @@ #include "rom3.h" #include "rom_8077ABC.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "sprite.h" #include "string_util.h" #include "task.h" diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 55fc45f95..956809814 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -13,7 +13,7 @@ #include "palette.h" #include "pokemon.h" #include "rom3.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" #include "task.h" diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c index f83eddc9f..3dcfca948 100644 --- a/src/battle/battle_controller_safari.c +++ b/src/battle/battle_controller_safari.c @@ -8,7 +8,7 @@ #include "menu_cursor.h" #include "palette.h" #include "rom3.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "text.h" #include "util.h" diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c index 77aa54873..0d698d9a5 100644 --- a/src/battle/battle_controller_wally.c +++ b/src/battle/battle_controller_wally.c @@ -9,7 +9,7 @@ #include "palette.h" #include "pokemon.h" #include "rom3.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "item_use.h" diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c index d35440246..ea393277e 100644 --- a/src/battle/battle_interface.c +++ b/src/battle/battle_interface.c @@ -7,7 +7,7 @@ #include "pokemon.h" #include "rom_8077ABC.h" #include "safari_zone.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "string_util.h" diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c index 97e9dc0fc..237686099 100644 --- a/src/battle/battle_party_menu.c +++ b/src/battle/battle_party_menu.c @@ -12,7 +12,7 @@ #include "pokemon_summary_screen.h" #include "rom_8077ABC.h" #include "rom_8094928.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" #include "strings.h" diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index 3d63a85c9..3587c008c 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -23,9 +23,9 @@ #include "script.h" #include "script_pokemon_80C4.h" #include "secret_base.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "starter_choose.h" #include "string_util.h" #include "strings.h" diff --git a/src/battle/battle_transition.c b/src/battle/battle_transition.c index f7c8073c5..985f43945 100644 --- a/src/battle/battle_transition.c +++ b/src/battle/battle_transition.c @@ -9,7 +9,7 @@ #include "random.h" #include "sprite.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "trainer.h" #include "field_camera.h" #include "ewram.h" diff --git a/src/battle/calculate_base_damage.c b/src/battle/calculate_base_damage.c index 42c26dee0..5f935f2be 100644 --- a/src/battle/calculate_base_damage.c +++ b/src/battle/calculate_base_damage.c @@ -1,5 +1,5 @@ #include "global.h" -#include "abilities.h" +#include "constants/abilities.h" #include "battle.h" #include "berry.h" #include "data2.h" @@ -8,7 +8,7 @@ #include "item.h" #include "items.h" #include "pokemon.h" -#include "species.h" +#include "constants/species.h" #include "moves.h" #include "battle_move_effects.h" #include "ewram.h" diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c index 8271e53ac..12fd5e5d9 100644 --- a/src/battle/pokeball.c +++ b/src/battle/pokeball.c @@ -8,7 +8,7 @@ #include "pokeball.h" #include "pokemon.h" #include "rom_8077ABC.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "task.h" diff --git a/src/battle_anim_80CA710.c b/src/battle_anim_80CA710.c index 01f445094..b3ebec9b9 100755 --- a/src/battle_anim_80CA710.c +++ b/src/battle_anim_80CA710.c @@ -10,7 +10,7 @@ #include "palette.h" #include "random.h" #include "rom_8077ABC.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "task.h" diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c index 14261b75e..968b047d9 100644 --- a/src/debug/sound_check_menu.c +++ b/src/debug/sound_check_menu.c @@ -6,7 +6,7 @@ #include "main.h" #include "text.h" #include "menu.h" -#include "songs.h" +#include "constants/songs.h" #include "title_screen.h" #include "sound.h" #include "pokedex_cry_screen.h" diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c index ec8acc65f..4dda372f4 100644 --- a/src/engine/cable_club.c +++ b/src/engine/cable_club.c @@ -14,7 +14,7 @@ #include "overworld.h" #include "script.h" #include "script_pokemon_80C4.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "start_menu.h" #include "string_util.h" diff --git a/src/engine/clear_save_data_menu.c b/src/engine/clear_save_data_menu.c index 498562fe0..12cde22a7 100644 --- a/src/engine/clear_save_data_menu.c +++ b/src/engine/clear_save_data_menu.c @@ -4,7 +4,7 @@ #include "menu.h" #include "palette.h" #include "save.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "strings2.h" diff --git a/src/engine/decompress.c b/src/engine/decompress.c index 0893a8492..69edf01aa 100644 --- a/src/engine/decompress.c +++ b/src/engine/decompress.c @@ -1,7 +1,7 @@ #include "global.h" #include "decompress.h" #include "data2.h" -#include "species.h" +#include "constants/species.h" #include "text.h" #include "ewram.h" diff --git a/src/engine/link.c b/src/engine/link.c index 441f3707b..27afef937 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -9,7 +9,7 @@ #include "palette.h" #include "random.h" #include "save.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "strings2.h" diff --git a/src/engine/main_menu.c b/src/engine/main_menu.c index a8375c6dd..909b5676b 100644 --- a/src/engine/main_menu.c +++ b/src/engine/main_menu.c @@ -13,9 +13,9 @@ #include "overworld.h" #include "rtc.h" #include "save_menu_util.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "string_util.h" #include "strings.h" #include "task.h" diff --git a/src/engine/menu.c b/src/engine/menu.c index a9c4aaa43..10988c1d7 100644 --- a/src/engine/menu.c +++ b/src/engine/menu.c @@ -4,7 +4,7 @@ #include "map_obj_lock.h" #include "menu_cursor.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "strings.h" #include "text.h" diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c index a472eea3b..b9c3d5ad8 100644 --- a/src/engine/mystery_event_menu.c +++ b/src/engine/mystery_event_menu.c @@ -6,7 +6,7 @@ #include "mystery_event_script.h" #include "palette.h" #include "save.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "string_util.h" diff --git a/src/engine/mystery_event_script.c b/src/engine/mystery_event_script.c index 69434710f..12ad329da 100644 --- a/src/engine/mystery_event_script.c +++ b/src/engine/mystery_event_script.c @@ -9,7 +9,7 @@ #include "pokemon.h" #include "pokemon_size_record.h" #include "script.h" -#include "species.h" +#include "constants/species.h" #include "strings.h" #include "string_util.h" #include "text.h" diff --git a/src/engine/naming_screen.c b/src/engine/naming_screen.c index 667a42ac8..4d2545440 100644 --- a/src/engine/naming_screen.c +++ b/src/engine/naming_screen.c @@ -8,7 +8,7 @@ #include "menu.h" #include "palette.h" #include "pokemon_icon.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "string_util.h" diff --git a/src/engine/record_mixing.c b/src/engine/record_mixing.c index 4b5f1b6d5..56e999651 100644 --- a/src/engine/record_mixing.c +++ b/src/engine/record_mixing.c @@ -18,7 +18,7 @@ #include "save.h" #include "script.h" #include "secret_base.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" #include "strings2.h" diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c index 5701c1185..67e146899 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/engine/reset_rtc_screen.c @@ -6,7 +6,7 @@ #include "rtc.h" #include "save.h" #include "sprite.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" #include "strings.h" diff --git a/src/engine/sound.c b/src/engine/sound.c index a6a61c0b5..159ad3f70 100644 --- a/src/engine/sound.c +++ b/src/engine/sound.c @@ -5,7 +5,7 @@ #include "m4a.h" #include "main.h" #include "pokemon.h" -#include "songs.h" +#include "constants/songs.h" #include "task.h" struct Fanfare diff --git a/src/engine/text.c b/src/engine/text.c index 1d1d31383..1b158d979 100644 --- a/src/engine/text.c +++ b/src/engine/text.c @@ -3,7 +3,7 @@ #include "battle.h" #include "main.h" #include "palette.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" diff --git a/src/engine/trade.c b/src/engine/trade.c index 729791aff..00b88c114 100644 --- a/src/engine/trade.c +++ b/src/engine/trade.c @@ -3,7 +3,7 @@ #include "string_util.h" #include "text.h" #include "main.h" -#include "species.h" +#include "constants/species.h" #include "items.h" #include "moves.h" #include "easy_chat.h" @@ -17,7 +17,7 @@ #include "pokemon_icon.h" #include "cable_club.h" #include "party_menu.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "data2.h" #include "pokemon_summary_screen.h" diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c index 2045c6b21..468890ca5 100644 --- a/src/engine/trainer_card.c +++ b/src/engine/trainer_card.c @@ -12,7 +12,7 @@ #include "pokedex.h" #include "overworld.h" #include "script_pokemon_80C4.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "string_util.h" diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c index 2b45766dd..5f2a84d06 100644 --- a/src/field/battle_tower.c +++ b/src/field/battle_tower.c @@ -17,7 +17,7 @@ #include "random.h" #include "save.h" #include "script_pokemon_80C4.h" -#include "species.h" +#include "constants/species.h" #include "string_util.h" #include "task.h" #include "text.h" diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c index 55405138d..9fe720b36 100644 --- a/src/field/berry_tag_screen.c +++ b/src/field/berry_tag_screen.c @@ -11,7 +11,7 @@ #include "menu_helpers.h" #include "palette.h" #include "overworld.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "string_util.h" diff --git a/src/field/bike.c b/src/field/bike.c index e36ae1798..75c99aaa1 100644 --- a/src/field/bike.c +++ b/src/field/bike.c @@ -7,7 +7,7 @@ #include "global.fieldmap.h" #include "metatile_behavior.h" #include "overworld.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" extern bool8 gBikeCyclingChallenge; diff --git a/src/field/birch_pc.c b/src/field/birch_pc.c index 9872dd54d..4b0025504 100644 --- a/src/field/birch_pc.c +++ b/src/field/birch_pc.c @@ -2,7 +2,7 @@ #include "event_data.h" #include "field_message_box.h" #include "pokedex.h" -#include "species.h" +#include "constants/species.h" extern u16 gSpecialVar_0x8004; extern u16 gSpecialVar_0x8005; diff --git a/src/field/braille_puzzles.c b/src/field/braille_puzzles.c index b11b1ff3a..c5e12c839 100644 --- a/src/field/braille_puzzles.c +++ b/src/field/braille_puzzles.c @@ -11,9 +11,9 @@ #include "menu.h" #include "rom6.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "task.h" #include "text.h" diff --git a/src/field/choose_party.c b/src/field/choose_party.c index c3845e48b..8d92719d1 100644 --- a/src/field/choose_party.c +++ b/src/field/choose_party.c @@ -11,7 +11,7 @@ #include "pokemon_summary_screen.h" #include "overworld.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "strings.h" #include "string_util.h" diff --git a/src/field/daycare.c b/src/field/daycare.c index 9f7e3b989..d3c86e812 100644 --- a/src/field/daycare.c +++ b/src/field/daycare.c @@ -14,9 +14,9 @@ #include "pokemon_storage_system.h" #include "random.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "string_util.h" #include "strings2.h" #include "text.h" diff --git a/src/field/decoration.c b/src/field/decoration.c index 8e6276a2f..89d8cbefd 100644 --- a/src/field/decoration.c +++ b/src/field/decoration.c @@ -3,7 +3,7 @@ #include "map_object_constants.h" #include "overworld.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "string_util.h" #include "menu.h" #include "menu_helpers.h" diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c index c7b4861d5..b7e7ec472 100644 --- a/src/field/field_control_avatar.c +++ b/src/field/field_control_avatar.c @@ -17,7 +17,7 @@ #include "safari_zone.h" #include "script.h" #include "secret_base.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "start_menu.h" #include "trainer_see.h" diff --git a/src/field/field_door.c b/src/field/field_door.c index ef349bca7..89dae725c 100644 --- a/src/field/field_door.c +++ b/src/field/field_door.c @@ -3,7 +3,7 @@ #include "field_camera.h" #include "fieldmap.h" #include "metatile_behavior.h" -#include "songs.h" +#include "constants/songs.h" #include "task.h" const u8 DoorAnimTiles_04[][0x100] = diff --git a/src/field/field_effect.c b/src/field/field_effect.c index 0ccbb6230..4337300da 100644 --- a/src/field/field_effect.c +++ b/src/field/field_effect.c @@ -12,7 +12,7 @@ #include "overworld.h" #include "task.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "decoration.h" #include "field_player_avatar.h" #include "field_map_obj_helpers.h" diff --git a/src/field/field_effect_helpers.c b/src/field/field_effect_helpers.c index c5b67fd9d..1d831d2e9 100644 --- a/src/field/field_effect_helpers.c +++ b/src/field/field_effect_helpers.c @@ -2,7 +2,7 @@ #include "sprite.h" #include "fieldmap.h" #include "metatile_behavior.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "field_map_obj.h" #include "field_camera.h" diff --git a/src/field/field_fadetransition.c b/src/field/field_fadetransition.c index 82776d18c..829ce2dfa 100644 --- a/src/field/field_fadetransition.c +++ b/src/field/field_fadetransition.c @@ -17,7 +17,7 @@ #include "palette.h" #include "overworld.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "start_menu.h" #include "task.h" diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c index a26638b39..166846ba0 100644 --- a/src/field/field_player_avatar.c +++ b/src/field/field_player_avatar.c @@ -17,7 +17,7 @@ #include "overworld.h" #include "rotating_gate.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "strings2.h" #include "task.h" diff --git a/src/field/field_special_scene.c b/src/field/field_special_scene.c index 5758929b6..6ef98f5e9 100644 --- a/src/field/field_special_scene.c +++ b/src/field/field_special_scene.c @@ -11,7 +11,7 @@ #include "overworld.h" #include "script.h" #include "script_movement.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "task.h" diff --git a/src/field/field_specials.c b/src/field/field_specials.c index e5bb1b798..279a7e3f6 100644 --- a/src/field/field_specials.c +++ b/src/field/field_specials.c @@ -14,19 +14,19 @@ #include "map_constants.h" #include "overworld.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "string_util.h" #include "strings.h" #include "pokeblock.h" -#include "species.h" -#include "abilities.h" +#include "constants/species.h" +#include "constants/abilities.h" #include "moves.h" #include "text.h" #include "wallclock.h" #include "tv.h" #include "rtc.h" #include "link.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "menu.h" #include "starter_choose.h" diff --git a/src/field/field_tasks.c b/src/field/field_tasks.c index e938a57ef..2da0f7303 100644 --- a/src/field/field_tasks.c +++ b/src/field/field_tasks.c @@ -16,7 +16,7 @@ #include "fieldmap.h" #include "field_player_avatar.h" #include "field_camera.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "field_tasks.h" diff --git a/src/field/field_weather.c b/src/field/field_weather.c index ff7c2e4c4..19ccca3bf 100644 --- a/src/field/field_weather.c +++ b/src/field/field_weather.c @@ -5,7 +5,7 @@ #include "palette.h" #include "random.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "task.h" diff --git a/src/field/field_weather_effects.c b/src/field/field_weather_effects.c index b1dca6396..31eda4393 100644 --- a/src/field/field_weather_effects.c +++ b/src/field/field_weather_effects.c @@ -4,7 +4,7 @@ #include "overworld.h" #include "random.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "task.h" diff --git a/src/field/fldeff_cut.c b/src/field/fldeff_cut.c index 599c916a2..edf38d800 100644 --- a/src/field/fldeff_cut.c +++ b/src/field/fldeff_cut.c @@ -11,7 +11,7 @@ #include "overworld.h" #include "rom6.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "task.h" diff --git a/src/field/fldeff_decoration.c b/src/field/fldeff_decoration.c index b0ac30062..d58f53a3c 100644 --- a/src/field/fldeff_decoration.c +++ b/src/field/fldeff_decoration.c @@ -6,7 +6,7 @@ #include "field_player_avatar.h" #include "fieldmap.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" #include "strings.h" diff --git a/src/field/fldeff_flash.c b/src/field/fldeff_flash.c index 30423a3f9..920791ce2 100644 --- a/src/field/fldeff_flash.c +++ b/src/field/fldeff_flash.c @@ -7,7 +7,7 @@ #include "overworld.h" #include "rom6.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "task.h" diff --git a/src/field/fldeff_poison.c b/src/field/fldeff_poison.c index 0a0cf5539..b0052d59d 100644 --- a/src/field/fldeff_poison.c +++ b/src/field/fldeff_poison.c @@ -1,7 +1,7 @@ #include "global.h" #include "fldeff_poison.h" #include "task.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" static void Task_FieldPoisonEffect(u8 taskId) diff --git a/src/field/fldeff_secret_base_pc.c b/src/field/fldeff_secret_base_pc.c index ead970b27..8d71a4fb9 100644 --- a/src/field/fldeff_secret_base_pc.c +++ b/src/field/fldeff_secret_base_pc.c @@ -5,7 +5,7 @@ #include "field_player_avatar.h" #include "fieldmap.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "task.h" diff --git a/src/field/fldeff_secretpower.c b/src/field/fldeff_secretpower.c index 5ec4407ae..cd9a2ae36 100644 --- a/src/field/fldeff_secretpower.c +++ b/src/field/fldeff_secretpower.c @@ -10,7 +10,7 @@ #include "rom6.h" #include "script.h" #include "secret_base.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" extern u8 gUnknown_081A2CE6[]; diff --git a/src/field/fldeff_softboiled.c b/src/field/fldeff_softboiled.c index c2a315233..a574232a8 100644 --- a/src/field/fldeff_softboiled.c +++ b/src/field/fldeff_softboiled.c @@ -4,7 +4,7 @@ #include "party_menu.h" #include "pokemon.h" #include "pokemon_menu.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "strings.h" diff --git a/src/field/item_menu.c b/src/field/item_menu.c index 67362d5f3..7d4b90bad 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -25,7 +25,7 @@ #include "pokemon_menu.h" #include "overworld.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "strings.h" diff --git a/src/field/item_use.c b/src/field/item_use.c index 14b13ca3b..764e78800 100644 --- a/src/field/item_use.c +++ b/src/field/item_use.c @@ -29,7 +29,7 @@ #include "overworld.h" #include "rom_8094928.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" #include "strings.h" diff --git a/src/field/lottery_corner.c b/src/field/lottery_corner.c index 5f0ce2907..b3bdeb494 100644 --- a/src/field/lottery_corner.c +++ b/src/field/lottery_corner.c @@ -3,7 +3,7 @@ #include "event_data.h" #include "items.h" #include "random.h" -#include "species.h" +#include "constants/species.h" #include "string_util.h" #include "text.h" diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c index a27c54df7..7c9c072a1 100644 --- a/src/field/mauville_man.c +++ b/src/field/mauville_man.c @@ -9,7 +9,7 @@ #include "overworld.h" #include "random.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" #include "strings.h" diff --git a/src/field/menu_helpers.c b/src/field/menu_helpers.c index 8e13e5546..e49c023c6 100644 --- a/src/field/menu_helpers.c +++ b/src/field/menu_helpers.c @@ -8,7 +8,7 @@ #include "menu.h" #include "menu_helpers.h" #include "overworld.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "task.h" diff --git a/src/field/overworld.c b/src/field/overworld.c index ca59426fa..d286a1951 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -39,9 +39,9 @@ #include "script.h" #include "script_pokemon_80C4.h" #include "secret_base.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "start_menu.h" #include "task.h" #include "tileset_anim.h" diff --git a/src/field/party_menu.c b/src/field/party_menu.c index a8620570b..a023a42ad 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -25,9 +25,9 @@ #include "pokemon_summary_screen.h" #include "rom_8077ABC.h" #include "rom_8094928.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #include "string_util.h" #include "strings.h" diff --git a/src/field/player_pc.c b/src/field/player_pc.c index ce78a88d8..2313d8c97 100644 --- a/src/field/player_pc.c +++ b/src/field/player_pc.c @@ -15,7 +15,7 @@ #include "string_util.h" #include "strings.h" #include "task.h" -#include "songs.h" +#include "constants/songs.h" #include "name_string_util.h" #include "mail.h" #include "overworld.h" diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c index 5aa03ff7a..56b197ca3 100644 --- a/src/field/pokeblock.c +++ b/src/field/pokeblock.c @@ -23,7 +23,7 @@ #include "item.h" #include "items.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "safari_zone.h" #include "event_data.h" #include "pokeblock.h" diff --git a/src/field/region_map.c b/src/field/region_map.c index 241b38bf6..df51d6173 100644 --- a/src/field/region_map.c +++ b/src/field/region_map.c @@ -11,7 +11,7 @@ #include "region_map.h" #include "overworld.h" #include "secret_base.h" -#include "songs.h" +#include "constants/songs.h" #include "sprite.h" #include "strings.h" #include "string_util.h" diff --git a/src/field/roamer.c b/src/field/roamer.c index d8ea1ef52..2eb26ef9d 100644 --- a/src/field/roamer.c +++ b/src/field/roamer.c @@ -2,7 +2,7 @@ #include "roamer.h" #include "pokemon.h" #include "random.h" -#include "species.h" +#include "constants/species.h" #ifdef SAPPHIRE #define ROAMER_SPECIES SPECIES_LATIAS diff --git a/src/field/rotating_gate.c b/src/field/rotating_gate.c index a672f3489..c3b6a8a71 100644 --- a/src/field/rotating_gate.c +++ b/src/field/rotating_gate.c @@ -4,7 +4,7 @@ #include "field_map_obj.h" #include "fieldmap.h" #include "map_constants.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" diff --git a/src/field/script_menu.c b/src/field/script_menu.c index e25e74d8c..caa1d7562 100644 --- a/src/field/script_menu.c +++ b/src/field/script_menu.c @@ -6,7 +6,7 @@ #include "menu.h" #include "palette.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "strings.h" diff --git a/src/field/secret_base.c b/src/field/secret_base.c index 34352f39a..3ada632dd 100644 --- a/src/field/secret_base.c +++ b/src/field/secret_base.c @@ -1,7 +1,7 @@ #include "global.h" #include "secret_base.h" #include "decoration.h" -#include "species.h" +#include "constants/species.h" #include "items.h" #include "moves.h" #include "event_data.h" @@ -16,7 +16,7 @@ #include "link.h" #include "main.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "map_constants.h" #include "map_name_popup.h" #include "menu.h" @@ -27,7 +27,7 @@ #include "overworld.h" #include "script.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "string_util.h" #include "strings.h" #include "task.h" diff --git a/src/field/shop.c b/src/field/shop.c index 493d8c748..cb97ea266 100644 --- a/src/field/shop.c +++ b/src/field/shop.c @@ -22,7 +22,7 @@ #include "item.h" #include "decoration.h" #include "items.h" -#include "songs.h" +#include "constants/songs.h" #include "overworld.h" #include "decoration_inventory.h" #include "field_camera.h" diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 6e44090df..7913e5527 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -20,7 +20,7 @@ #include "save.h" #include "save_menu_util.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "string_util.h" diff --git a/src/field/starter_choose.c b/src/field/starter_choose.c index 49590f83a..149eaa03d 100644 --- a/src/field/starter_choose.c +++ b/src/field/starter_choose.c @@ -6,9 +6,9 @@ #include "menu.h" #include "palette.h" #include "pokedex.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #include "string_util.h" #include "strings.h" diff --git a/src/field/trader.c b/src/field/trader.c index 61f48fad8..69eef1152 100644 --- a/src/field/trader.c +++ b/src/field/trader.c @@ -7,7 +7,7 @@ #include "menu.h" #include "menu_helpers.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" #include "strings.h" diff --git a/src/field/tv.c b/src/field/tv.c index e58adebc9..28737ecaa 100644 --- a/src/field/tv.c +++ b/src/field/tv.c @@ -12,7 +12,7 @@ #include "random.h" #include "string_util.h" #include "text.h" -#include "species.h" +#include "constants/species.h" #include "pokedex.h" #include "naming_screen.h" #include "overworld.h" @@ -34,7 +34,7 @@ #include "overworld.h" #include "rtc.h" #include "script_menu.h" -#include "species.h" +#include "constants/species.h" #include "string_util.h" #include "strings.h" #include "text.h" diff --git a/src/field/use_pokeblock.c b/src/field/use_pokeblock.c index d301d93d6..8155b4216 100644 --- a/src/field/use_pokeblock.c +++ b/src/field/use_pokeblock.c @@ -15,7 +15,7 @@ #include "text.h" #include "menu.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "pokeblock.h" #define GFX_TAG_CONDITIONUPDOWN 0 diff --git a/src/field/wallclock.c b/src/field/wallclock.c index d86b1bc95..2892d09f9 100644 --- a/src/field/wallclock.c +++ b/src/field/wallclock.c @@ -5,7 +5,7 @@ #include "menu.h" #include "palette.h" #include "rtc.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "strings2.h" #include "task.h" diff --git a/src/field/wild_encounter.c b/src/field/wild_encounter.c index df0b12207..b19b1d4c2 100644 --- a/src/field/wild_encounter.c +++ b/src/field/wild_encounter.c @@ -1,6 +1,6 @@ #include "global.h" #include "wild_encounter.h" -#include "abilities.h" +#include "constants/abilities.h" #include "battle_setup.h" #include "event_data.h" #include "field_player_avatar.h" @@ -13,7 +13,7 @@ #include "overworld.h" #include "safari_zone.h" #include "script.h" -#include "species.h" +#include "constants/species.h" #include "tv.h" const struct WildPokemon PetalburgCity_WaterMons [] = diff --git a/src/pokemon/learn_move.c b/src/pokemon/learn_move.c index 55aac840f..8cc7df9d4 100644 --- a/src/pokemon/learn_move.c +++ b/src/pokemon/learn_move.c @@ -8,7 +8,7 @@ #include "pokemon.h" #include "overworld.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "string_util.h" diff --git a/src/pokemon/mail_data.c b/src/pokemon/mail_data.c index ae3f4b3e8..fce796ab0 100644 --- a/src/pokemon/mail_data.c +++ b/src/pokemon/mail_data.c @@ -4,7 +4,7 @@ #include "name_string_util.h" #include "pokemon.h" #include "pokemon_icon.h" -#include "species.h" +#include "constants/species.h" #include "text.h" void ClearMailData(void) diff --git a/src/pokemon/mon_markings.c b/src/pokemon/mon_markings.c index 29e8c5127..d90947c76 100644 --- a/src/pokemon/mon_markings.c +++ b/src/pokemon/mon_markings.c @@ -2,7 +2,7 @@ #include "main.h" #include "menu_cursor.h" #include "text_window.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c index 604085b28..a4d84bebd 100644 --- a/src/pokemon/pokedex.c +++ b/src/pokemon/pokedex.c @@ -16,9 +16,9 @@ #include "pokemon.h" #include "random.h" #include "overworld.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "string_util.h" #include "strings.h" #include "task.h" diff --git a/src/pokemon/pokemon_1.c b/src/pokemon/pokemon_1.c index d44a8b61e..e0c28bdba 100644 --- a/src/pokemon/pokemon_1.c +++ b/src/pokemon/pokemon_1.c @@ -5,7 +5,7 @@ #include "pokemon.h" #include "random.h" #include "overworld.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #include "string_util.h" #include "text.h" diff --git a/src/pokemon/pokemon_2.c b/src/pokemon/pokemon_2.c index cedcc2720..8e5d7a33f 100644 --- a/src/pokemon/pokemon_2.c +++ b/src/pokemon/pokemon_2.c @@ -6,7 +6,7 @@ #include "pokemon.h" #include "random.h" #include "rom_8077ABC.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #include "string_util.h" #include "strings2.h" diff --git a/src/pokemon/pokemon_3.c b/src/pokemon/pokemon_3.c index 40165384d..a0e73b952 100644 --- a/src/pokemon/pokemon_3.c +++ b/src/pokemon/pokemon_3.c @@ -15,9 +15,9 @@ #include "rom_8077ABC.h" #include "rom_8094928.h" #include "rtc.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #include "string_util.h" #include "text.h" diff --git a/src/pokemon/pokemon_data.c b/src/pokemon/pokemon_data.c index 3d13a3390..a00cea842 100644 --- a/src/pokemon/pokemon_data.c +++ b/src/pokemon/pokemon_data.c @@ -1,8 +1,8 @@ #include "global.h" #include "pokemon.h" -#include "species.h" +#include "constants/species.h" #include "trainer.h" -#include "abilities.h" +#include "constants/abilities.h" #include "moves.h" #include "hold_effects.h" #include "items.h" diff --git a/src/pokemon/pokemon_icon.c b/src/pokemon/pokemon_icon.c index e83f912ec..b1b462761 100644 --- a/src/pokemon/pokemon_icon.c +++ b/src/pokemon/pokemon_icon.c @@ -1,7 +1,7 @@ #include "global.h" #include "graphics.h" #include "mail_data.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #define POKE_ICON_BASE_PAL_TAG 56000 diff --git a/src/pokemon/pokemon_menu.c b/src/pokemon/pokemon_menu.c index 07d7e5322..9811a6f77 100644 --- a/src/pokemon/pokemon_menu.c +++ b/src/pokemon/pokemon_menu.c @@ -5,7 +5,7 @@ #include "palette.h" #include "menu.h" #include "mail_data.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "main.h" #include "overworld.h" diff --git a/src/pokemon/pokemon_size_record.c b/src/pokemon/pokemon_size_record.c index a71e6f1fd..260396de0 100644 --- a/src/pokemon/pokemon_size_record.c +++ b/src/pokemon/pokemon_size_record.c @@ -3,7 +3,7 @@ #include "data2.h" #include "event_data.h" #include "pokedex.h" -#include "species.h" +#include "constants/species.h" #include "string_util.h" #include "strings2.h" #include "text.h" diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 5cd1c8942..bf1956187 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -12,7 +12,7 @@ #include "overworld.h" #include "palette.h" #include "region_map.h" -#include "songs.h" +#include "constants/songs.h" #include "string_util.h" #include "sound.h" #include "task.h" diff --git a/src/rom3.c b/src/rom3.c index 16e605390..b150893d3 100644 --- a/src/rom3.c +++ b/src/rom3.c @@ -11,7 +11,7 @@ #include "pokemon.h" #include "rom3.h" #include "rom_8094928.h" -#include "species.h" +#include "constants/species.h" #include "task.h" #include "util.h" #include "battle_message.h" diff --git a/src/rom6.c b/src/rom6.c index 32b5f52a5..c25f0f9f5 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -8,7 +8,7 @@ #include "pokemon_menu.h" #include "overworld.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "task.h" diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index e4801a194..42f360b69 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -7,7 +7,7 @@ #include "decompress.h" #include "palette.h" #include "pokemon_icon.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #include "task.h" #include "trig.h" diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c index 91b5c10bc..790549ca4 100644 --- a/src/scene/berry_blender.c +++ b/src/scene/berry_blender.c @@ -7,7 +7,7 @@ #include "menu.h" #include "strings2.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "berry.h" #include "string_util.h" #include "link.h" diff --git a/src/scene/credits.c b/src/scene/credits.c index fed1d993a..81be60c9f 100644 --- a/src/scene/credits.c +++ b/src/scene/credits.c @@ -10,9 +10,9 @@ #include "palette.h" #include "pokedex.h" #include "random.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "starter_choose.h" #include "task.h" #include "trig.h" diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c index 3675b42cf..ef4f5ce78 100644 --- a/src/scene/egg_hatch.c +++ b/src/scene/egg_hatch.c @@ -13,7 +13,7 @@ #include "pokemon.h" #include "random.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" #include "strings2.h" diff --git a/src/scene/evolution_graphics.c b/src/scene/evolution_graphics.c index dc0e219c5..b9ef5b402 100644 --- a/src/scene/evolution_graphics.c +++ b/src/scene/evolution_graphics.c @@ -6,7 +6,7 @@ #include "decompress.h" #include "task.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "palette.h" // this file's functions diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index 1bbb8d485..f5612f86b 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -16,9 +16,9 @@ #include "trade.h" #include "menu.h" #include "pokedex.h" -#include "species.h" +#include "constants/species.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "overworld.h" #include "battle_message.h" #include "pokemon_summary_screen.h" diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c index 63aaf79c9..1751ee99c 100644 --- a/src/scene/hall_of_fame.c +++ b/src/scene/hall_of_fame.c @@ -3,14 +3,14 @@ #include "task.h" #include "palette.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "pokemon.h" #include "text.h" #include "strings.h" #include "string_util.h" #include "menu.h" #include "save.h" -#include "species.h" +#include "constants/species.h" #include "overworld.h" #include "m4a.h" #include "data2.h" diff --git a/src/scene/intro.c b/src/scene/intro.c index c713071e7..9e334d06b 100644 --- a/src/scene/intro.c +++ b/src/scene/intro.c @@ -13,9 +13,9 @@ #include "palette.h" #include "random.h" #include "save.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "task.h" #include "title_screen.h" #include "trig.h" diff --git a/src/scene/intro_credits_graphics.c b/src/scene/intro_credits_graphics.c index bb80ef3b6..05c67696a 100755 --- a/src/scene/intro_credits_graphics.c +++ b/src/scene/intro_credits_graphics.c @@ -13,9 +13,9 @@ #include "palette.h" #include "random.h" #include "save.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "task.h" #include "title_screen.h" #include "trig.h" diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c index 9b6265308..4a875d58c 100644 --- a/src/script_pokemon_util_80C4BF0.c +++ b/src/script_pokemon_util_80C4BF0.c @@ -20,7 +20,7 @@ #include "random.h" #include "overworld.h" #include "script_pokemon_80C4.h" -#include "species.h" +#include "constants/species.h" #include "task.h" #include "ewram.h" diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c index 21ff220d2..95555d167 100644 --- a/src/script_pokemon_util_80F99CC.c +++ b/src/script_pokemon_util_80F99CC.c @@ -12,7 +12,7 @@ #include "overworld.h" #include "script.h" #include "script_pokemon_80F9.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" #include "task.h" |