diff options
Diffstat (limited to 'src')
80 files changed, 14 insertions, 121 deletions
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index 877fba80a..952c1487f 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -5,7 +5,6 @@ #include "item.h" #include "random.h" #include "battle_ai_script_commands.h" -#include "constants/species.h" #include "constants/abilities.h" #include "constants/battle_ai.h" #include "constants/battle_move_effects.h" diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index e689d2353..a77a4cf56 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -8,7 +8,6 @@ #include "constants/item_effects.h" #include "constants/items.h" #include "constants/moves.h" -#include "constants/species.h" #include "constants/pokemon.h" static bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng); diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index 07b44d53a..c259755df 100644 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -13,7 +13,6 @@ #include "util.h" #include "constants/battle_anim.h" #include "constants/songs.h" -#include "constants/species.h" #include "constants/weather.h" // Function Declarations diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c index 036e1b052..ee5d4017d 100644 --- a/src/battle_anim_mons.c +++ b/src/battle_anim_mons.c @@ -8,7 +8,6 @@ #include "trig.h" #include "util.h" #include "constants/battle_anim.h" -#include "constants/species.h" #define GET_UNOWN_LETTER(personality) (( \ (((personality & 0x03000000) >> 24) << 6) \ diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c index ee99b75a6..44deed318 100644 --- a/src/battle_anim_sound_tasks.c +++ b/src/battle_anim_sound_tasks.c @@ -4,7 +4,6 @@ #include "battle_anim.h" #include "task.h" #include "constants/battle_anim.h" -#include "constants/species.h" static void sub_80DCE78(u8 taskId); static void sub_80DCEE4(u8 taskId); diff --git a/src/battle_controller_pokedude.c b/src/battle_controller_pokedude.c index 2e55c5bfa..e6af71b6c 100644 --- a/src/battle_controller_pokedude.c +++ b/src/battle_controller_pokedude.c @@ -20,7 +20,6 @@ #include "constants/songs.h" #include "constants/moves.h" #include "constants/pokemon.h" -#include "constants/trainers.h" struct Unk_84790E8 { diff --git a/src/battle_controllers.c b/src/battle_controllers.c index b7737090a..583a64eaa 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -13,7 +13,6 @@ #include "task.h" #include "util.h" #include "constants/abilities.h" -#include "constants/species.h" #include "constants/battle.h" static EWRAM_DATA u8 sLinkSendTaskId = 0; diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 9795c52ff..4340703e3 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -14,7 +14,6 @@ #include "battle_anim.h" #include "battle_interface.h" #include "constants/battle_anim.h" -#include "constants/species.h" #include "constants/moves.h" #include "constants/songs.h" diff --git a/src/battle_intro.c b/src/battle_intro.c index 25fdbafda..04c7072d9 100644 --- a/src/battle_intro.c +++ b/src/battle_intro.c @@ -6,7 +6,6 @@ #include "scanline_effect.h" #include "task.h" #include "trig.h" -#include "constants/trainers.h" static EWRAM_DATA u16 sBgCnt = 0; diff --git a/src/battle_main.c b/src/battle_main.c index 0d14d9b5b..08bf6e345 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -42,8 +42,6 @@ #include "constants/moves.h" #include "constants/pokemon.h" #include "constants/songs.h" -#include "constants/species.h" -#include "constants/trainers.h" #include "constants/trainer_classes.h" static void sub_80111EC(struct Sprite *sprite); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index a56163180..90ee8e561 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -33,11 +33,9 @@ #include "constants/items.h" #include "constants/hold_effects.h" #include "constants/songs.h" -#include "constants/species.h" #include "constants/moves.h" #include "constants/abilities.h" #include "constants/pokemon.h" -#include "constants/trainers.h" #include "constants/maps.h" #define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattlerTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED)) diff --git a/src/battle_setup.c b/src/battle_setup.c index 8ee061361..058573aaf 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -27,13 +27,10 @@ #include "battle_transition.h" #include "battle_controllers.h" #include "constants/battle_setup.h" -#include "constants/flags.h" #include "constants/items.h" #include "constants/maps.h" #include "constants/songs.h" -#include "constants/species.h" #include "constants/pokemon.h" -#include "constants/trainers.h" #include "constants/trainer_classes.h" enum @@ -671,7 +668,7 @@ static u8 TrainerBattleLoadArg8(const u8 *ptr) static u16 GetTrainerAFlag(void) { - return FLAG_TRAINER_FLAG_START + gTrainerBattleOpponent_A; + return TRAINER_FLAGS_START + gTrainerBattleOpponent_A; } static bool32 IsPlayerDefeated(u32 battleOutcome) @@ -828,7 +825,7 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data) { u32 flag = TrainerBattleLoadArg16(data + 2); - return FlagGet(FLAG_TRAINER_FLAG_START + flag); + return FlagGet(TRAINER_FLAGS_START + flag); } void SetUpTrainerMovement(void) @@ -866,17 +863,17 @@ static void SetBattledTrainerFlag2(void) bool8 HasTrainerBeenFought(u16 trainerId) { - return FlagGet(FLAG_TRAINER_FLAG_START + trainerId); + return FlagGet(TRAINER_FLAGS_START + trainerId); } void SetTrainerFlag(u16 trainerId) { - FlagSet(FLAG_TRAINER_FLAG_START + trainerId); + FlagSet(TRAINER_FLAGS_START + trainerId); } void ClearTrainerFlag(u16 trainerId) { - FlagClear(FLAG_TRAINER_FLAG_START + trainerId); + FlagClear(TRAINER_FLAGS_START + trainerId); } void StartTrainerBattle(void) diff --git a/src/battle_tower.c b/src/battle_tower.c index 818c909aa..04f3019b1 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -19,11 +19,9 @@ #include "save.h" #include "item.h" #include "script_pokemon_util.h" -#include "constants/species.h" #include "constants/items.h" #include "constants/moves.h" #include "constants/pokemon.h" -#include "constants/vars.h" #include "constants/event_objects.h" static EWRAM_DATA u16 sSpecialVar_0x8004_Copy = 0; diff --git a/src/battle_util.c b/src/battle_util.c index d28e524a8..45025ae1a 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -20,8 +20,6 @@ #include "constants/battle.h" #include "constants/moves.h" #include "constants/items.h" -#include "constants/flags.h" -#include "constants/species.h" #include "constants/weather.h" #include "constants/abilities.h" #include "constants/pokemon.h" diff --git a/src/credits.c b/src/credits.c index 4ef4a1a9d..fc45781ad 100644 --- a/src/credits.c +++ b/src/credits.c @@ -11,7 +11,6 @@ #include "trainer_pokemon_sprites.h" #include "menu.h" #include "field_weather.h" -#include "constants/species.h" #include "constants/maps.h" #include "constants/field_weather.h" diff --git a/src/data.c b/src/data.c index 54c67c875..6b4e113af 100644 --- a/src/data.c +++ b/src/data.c @@ -5,8 +5,6 @@ #include "graphics.h" #include "constants/items.h" #include "constants/moves.h" -#include "constants/species.h" -#include "constants/trainers.h" #include "constants/battle_ai.h" #include "constants/trainer_classes.h" diff --git a/src/data/easy_chat/easy_chat_group_pokemon.h b/src/data/easy_chat/easy_chat_group_pokemon.h index 15a182889..e3f54c19e 100644 --- a/src/data/easy_chat/easy_chat_group_pokemon.h +++ b/src/data/easy_chat/easy_chat_group_pokemon.h @@ -1,5 +1,3 @@ -#include "constants/species.h" - static const u16 sEasyChatGroup_Pokemon[] = { SPECIES_ABRA, SPECIES_ABSOL, diff --git a/src/data/easy_chat/easy_chat_group_pokemon2.h b/src/data/easy_chat/easy_chat_group_pokemon2.h index fbd3c0564..26211eec5 100644 --- a/src/data/easy_chat/easy_chat_group_pokemon2.h +++ b/src/data/easy_chat/easy_chat_group_pokemon2.h @@ -1,5 +1,3 @@ -#include "constants/species.h" - static const u16 sEasyChatGroup_Pokemon2[] = { SPECIES_ABRA, SPECIES_AERODACTYL, diff --git a/src/daycare.c b/src/daycare.c index 05d83c571..fe0de9bc6 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1,7 +1,6 @@ #include "global.h" #include "gflib.h" #include "battle.h" -#include "constants/species.h" #include "constants/items.h" #include "mail_data.h" #include "pokemon_storage_system.h" diff --git a/src/decompress.c b/src/decompress.c index a49b5d290..3af15cfc8 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -2,7 +2,6 @@ #include "gflib.h" #include "decompress.h" #include "pokemon.h" -#include "constants/species.h" extern const struct CompressedSpriteSheet gMonFrontPicTable[]; extern const struct CompressedSpriteSheet gMonBackPicTable[]; diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c index 5a95c8549..f9ea77003 100644 --- a/src/dodrio_berry_picking.c +++ b/src/dodrio_berry_picking.c @@ -15,7 +15,6 @@ #include "constants/songs.h" #include "constants/fanfares.h" #include "constants/items.h" -#include "constants/species.h" struct DodrioStruct { diff --git a/src/easy_chat.c b/src/easy_chat.c index c34ace10d..bf617a854 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -11,8 +11,6 @@ #include "random.h" #include "strings.h" #include "constants/easy_chat.h" -#include "constants/flags.h" -#include "constants/species.h" struct Unk203A120 { diff --git a/src/event_data.c b/src/event_data.c index 6cd6f277b..df5d2fce5 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -33,7 +33,7 @@ extern u16 *const gSpecialVars[]; void InitEventData(void) { - memset(gSaveBlock1Ptr->flags, 0, FLAGS_COUNT); + memset(gSaveBlock1Ptr->flags, 0, NUM_FLAG_BYTES); memset(gSaveBlock1Ptr->vars, 0, VARS_COUNT * 2); memset(sSpecialFlags, 0, SPECIAL_FLAGS_COUNT); } diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 8a1f89685..639194773 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -23,7 +23,6 @@ #include "text_window.h" #include "trig.h" #include "battle_string_ids.h" -#include "constants/species.h" #include "constants/songs.h" #include "constants/pokemon.h" diff --git a/src/fame_checker.c b/src/fame_checker.c index 15052c964..48e5cf00a 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -18,7 +18,6 @@ #include "text_window.h" #include "fame_checker.h" #include "strings.h" -#include "constants/trainers.h" #define SPRITETAG_SELECTOR_CURSOR 1000 #define SPRITETAG_QUESTION_MARK 1001 diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 8e87cdf0e..9d2cb5620 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -23,9 +23,7 @@ #include "constants/event_object_movement.h" #include "constants/event_objects.h" #include "constants/songs.h" -#include "constants/flags.h" #include "constants/metatile_behaviors.h" -#include "constants/species.h" #include "constants/moves.h" static EWRAM_DATA struct ObjectEvent * gUnknown_2036E30 = NULL; diff --git a/src/field_poison.c b/src/field_poison.c index ed2a9360d..d4ed5e45f 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -8,7 +8,6 @@ #include "fldeff.h" #include "party_menu.h" #include "field_poison.h" -#include "constants/species.h" #include "constants/battle.h" static bool32 IsMonValidSpecies(struct Pokemon *pokemon) diff --git a/src/field_specials.c b/src/field_specials.c index 98f9852cd..020a0d54d 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -34,7 +34,6 @@ #include "dynamic_placeholder_text_util.h" #include "new_menu_helpers.h" #include "constants/songs.h" -#include "constants/species.h" #include "constants/items.h" #include "constants/maps.h" #include "constants/region_map_sections.h" diff --git a/src/field_tasks.c b/src/field_tasks.c index 3f22fd3b9..20fc8de27 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -12,10 +12,8 @@ #include "script.h" #include "task.h" #include "constants/field_tasks.h" -#include "constants/flags.h" #include "constants/metatile_labels.h" #include "constants/songs.h" -#include "constants/vars.h" // TODO: Metatile IDs in this file diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 305da6206..8480edfaf 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -24,9 +24,6 @@ #include "random.h" #include "graphics.h" #include "constants/songs.h" -#include "constants/species.h" -#include "constants/flags.h" -#include "constants/vars.h" #include "constants/maps.h" struct HallofFameMon diff --git a/src/heal_location.c b/src/heal_location.c index ae02c7844..75a826a4a 100644 --- a/src/heal_location.c +++ b/src/heal_location.c @@ -1,7 +1,6 @@ #include "global.h" #include "heal_location.h" #include "event_data.h" -#include "constants/vars.h" #include "constants/maps.h" #include "constants/heal_locations.h" diff --git a/src/intro.c b/src/intro.c index b32db2e07..e2cdb56f5 100644 --- a/src/intro.c +++ b/src/intro.c @@ -14,7 +14,6 @@ #include "util.h" #include "trig.h" #include "constants/songs.h" -#include "constants/species.h" struct IntroSequenceData; diff --git a/src/item_use.c b/src/item_use.c index bd1a46d7e..9c434acdb 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -32,7 +32,6 @@ #include "tm_case.h" #include "vs_seeker.h" #include "constants/fanfares.h" -#include "constants/flags.h" #include "constants/items.h" #include "constants/maps.h" #include "constants/moves.h" diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c index 77672f5d8..31e76dfd0 100644 --- a/src/link_rfu_2.c +++ b/src/link_rfu_2.c @@ -9,7 +9,6 @@ #include "quest_log.h" #include "random.h" #include "task.h" -#include "constants/species.h" #include "constants/union_room.h" struct SioInfo diff --git a/src/link_rfu_3.c b/src/link_rfu_3.c index 81528c6c3..7aac44593 100644 --- a/src/link_rfu_3.c +++ b/src/link_rfu_3.c @@ -5,7 +5,6 @@ #include "link.h" #include "link_rfu.h" #include "random.h" -#include "constants/flags.h" static EWRAM_DATA u8 gWirelessStatusIndicatorSpriteId = 0; diff --git a/src/mail.c b/src/mail.c index 34242f1b6..7575072b6 100644 --- a/src/mail.c +++ b/src/mail.c @@ -18,7 +18,6 @@ #include "string_util.h" #include "strings.h" #include "constants/items.h" -#include "constants/species.h" enum MailIconParam { diff --git a/src/mail_data.c b/src/mail_data.c index a032cdd95..e6495dc72 100644 --- a/src/mail_data.c +++ b/src/mail_data.c @@ -2,7 +2,6 @@ #include "gflib.h" #include "mail.h" #include "mail_data.h" -#include "constants/species.h" #include "constants/items.h" #include "pokemon_icon.h" diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 6629fcac5..a7da18beb 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -6,7 +6,6 @@ #include "quest_log.h" #include "region_map.h" #include "strings.h" -#include "constants/flags.h" static void Task_MapNamePopup(u8 taskId); static u16 MapNamePopupCreateWindow(bool32 palIntoFadedBuffer); diff --git a/src/menu2.c b/src/menu2.c index cc596dba4..b7b3adeb9 100644 --- a/src/menu2.c +++ b/src/menu2.c @@ -2,7 +2,6 @@ #include "gflib.h" #include "task.h" #include "wild_encounter.h" -#include "constants/species.h" static void Task_SmoothBlendLayers(u8 taskId); diff --git a/src/mevent.c b/src/mevent.c index 3069c4d0a..04fcb4b19 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -1,7 +1,6 @@ #include "global.h" #include "gflib.h" #include "constants/songs.h" -#include "constants/species.h" #include "easy_chat.h" #include "task.h" #include "decompress.h" diff --git a/src/mevent_show_card.c b/src/mevent_show_card.c index a23f26f42..f6687eab7 100644 --- a/src/mevent_show_card.c +++ b/src/mevent_show_card.c @@ -1,6 +1,5 @@ #include "global.h" #include "gflib.h" -#include "constants/species.h" #include "decompress.h" #include "menu.h" #include "new_menu_helpers.h" diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c index 1fea39b60..b959821d7 100644 --- a/src/mystery_event_script.c +++ b/src/mystery_event_script.c @@ -9,7 +9,6 @@ #include "pokedex.h" #include "pokemon_size_record.h" #include "script.h" -#include "constants/species.h" #include "strings.h" #include "util.h" #include "mystery_event_msg.h" diff --git a/src/naming_screen.c b/src/naming_screen.c index 2fdf457f9..76c1a241e 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -21,7 +21,6 @@ #include "text_window.h" #include "trig.h" #include "constants/help_system.h" -#include "constants/flags.h" #include "constants/songs.h" #include "constants/event_objects.h" diff --git a/src/oak_speech.c b/src/oak_speech.c index 2b034d017..35864576f 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -15,7 +15,6 @@ #include "overworld.h" #include "random.h" #include "data.h" -#include "constants/species.h" #include "constants/songs.h" struct OakSpeechResources diff --git a/src/overworld.c b/src/overworld.c index 0e50a984d..7bdd0ddb4 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -48,8 +48,6 @@ #include "vs_seeker.h" #include "wild_encounter.h" #include "constants/maps.h" -#include "constants/flags.h" -#include "constants/species.h" #include "constants/region_map_sections.h" #include "constants/songs.h" diff --git a/src/party_menu.c b/src/party_menu.c index 43ee671b0..ec782a03d 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -60,7 +60,6 @@ #include "constants/battle.h" #include "constants/easy_chat.h" #include "constants/field_effects.h" -#include "constants/flags.h" #include "constants/item_effects.h" #include "constants/items.h" #include "constants/maps.h" @@ -68,7 +67,6 @@ #include "constants/pokemon.h" #include "constants/quest_log.h" #include "constants/songs.h" -#include "constants/species.h" #define PARTY_PAL_SELECTED (1 << 0) #define PARTY_PAL_FAINTED (1 << 1) diff --git a/src/pokedex.c b/src/pokedex.c index 8586382b5..c49767ea9 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1,7 +1,6 @@ #include "global.h" #include "pokedex.h" #include "pokedex_screen.h" -#include "constants/species.h" const u8 *sub_8088E20(u16 dexNum) { diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c index 0d140cfe3..e44cc6d50 100644 --- a/src/pokedex_screen.c +++ b/src/pokedex_screen.c @@ -16,7 +16,6 @@ #include "pokedex.h" #include "trainer_pokemon_sprites.h" #include "constants/songs.h" -#include "constants/species.h" struct PokedexScreenData { diff --git a/src/pokemon.c b/src/pokemon.c index ac0699e56..fda83ee3d 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -25,11 +25,9 @@ #include "field_specials.h" #include "constants/items.h" #include "constants/item_effects.h" -#include "constants/species.h" #include "constants/hoenn_cries.h" #include "constants/pokemon.h" #include "constants/abilities.h" -#include "constants/flags.h" #include "constants/moves.h" #include "constants/songs.h" #include "constants/trainer_classes.h" @@ -5020,10 +5018,10 @@ static u16 HoennPokedexNumToSpecies(u16 var) species = 0; - while (species < POKEMON_SLOTS_NUMBER - 1 && sSpeciesToHoennPokedexNum[species] != var) + while (species < NUM_SPECIES - 1 && sSpeciesToHoennPokedexNum[species] != var) species++; - if (species == POKEMON_SLOTS_NUMBER - 1) + if (species == NUM_SPECIES - 1) return 0; return species + 1; @@ -5038,10 +5036,10 @@ u16 NationalPokedexNumToSpecies(u16 nationalNum) species = 0; - while (species < POKEMON_SLOTS_NUMBER - 1 && sSpeciesToNationalPokedexNum[species] != nationalNum) + while (species < NUM_SPECIES - 1 && sSpeciesToNationalPokedexNum[species] != nationalNum) species++; - if (species == POKEMON_SLOTS_NUMBER - 1) + if (species == NUM_SPECIES - 1) return 0; return species + 1; @@ -5056,10 +5054,10 @@ static u16 NationalToHoennOrder(u16 nationalNum) hoennNum = 0; - while (hoennNum < POKEMON_SLOTS_NUMBER - 1 && sHoennToNationalOrder[hoennNum] != nationalNum) + while (hoennNum < NUM_SPECIES - 1 && sHoennToNationalOrder[hoennNum] != nationalNum) hoennNum++; - if (hoennNum == POKEMON_SLOTS_NUMBER - 1) + if (hoennNum == NUM_SPECIES - 1) return 0; return hoennNum + 1; diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 133caeb63..2ca312ae0 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -3,7 +3,6 @@ #include "mail_data.h" #include "pokemon_icon.h" #include "graphics.h" -#include "constants/species.h" #define POKE_ICON_BASE_PAL_TAG 56000 diff --git a/src/pokemon_jump_2.c b/src/pokemon_jump_2.c index 862416c65..e51d79814 100644 --- a/src/pokemon_jump_2.c +++ b/src/pokemon_jump_2.c @@ -9,7 +9,6 @@ #include "task.h" #include "pokemon_jump.h" #include "constants/songs.h" -#include "constants/species.h" struct PokemonJump1 { diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c index 6041ce7ff..3d0495327 100644 --- a/src/pokemon_size_record.c +++ b/src/pokemon_size_record.c @@ -5,7 +5,6 @@ #include "pokedex.h" #include "text.h" #include "strings.h" -#include "constants/species.h" #define DEFAULT_MAX_SIZE 0 // was 0x8100 in Ruby/Sapphire, 0x8000 in Emerald diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 0ce31b712..1ac8a86dc 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -1,7 +1,6 @@ #include "global.h" #include "gflib.h" #include "pokemon_storage_system_internal.h" -#include "constants/species.h" void BackupPokemonStorage(struct PokemonStorage * dest) { diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c index d8be81b62..397bdda41 100644 --- a/src/pokemon_storage_system_2.c +++ b/src/pokemon_storage_system_2.c @@ -11,7 +11,6 @@ #include "script.h" #include "strings.h" #include "task.h" -#include "constants/species.h" #include "constants/songs.h" #include "constants/field_weather.h" #include "constants/help_system.h" diff --git a/src/pokemon_storage_system_3.c b/src/pokemon_storage_system_3.c index dcf56186e..262040a85 100644 --- a/src/pokemon_storage_system_3.c +++ b/src/pokemon_storage_system_3.c @@ -25,8 +25,6 @@ #include "constants/items.h" #include "constants/help_system.h" #include "constants/songs.h" -#include "constants/flags.h" -#include "constants/vars.h" EWRAM_DATA struct PokemonStorageSystemData *gPSSData = NULL; static EWRAM_DATA bool8 sInPartyMenu = 0; diff --git a/src/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c index b1b5408fe..5f88fff95 100644 --- a/src/pokemon_storage_system_4.c +++ b/src/pokemon_storage_system_4.c @@ -8,9 +8,6 @@ #include "strings.h" #include "task.h" #include "trig.h" -#include "constants/species.h" -#include "constants/vars.h" -#include "constants/flags.h" static void sub_8090324(struct Sprite * sprite); static void SetBoxSpeciesAndPersonalities(u8 boxId); diff --git a/src/pokemon_storage_system_7.c b/src/pokemon_storage_system_7.c index 769787c24..3d0472230 100644 --- a/src/pokemon_storage_system_7.c +++ b/src/pokemon_storage_system_7.c @@ -4,7 +4,6 @@ #include "pokemon_icon.h" #include "pokemon_storage_system_internal.h" #include "text_window.h" -#include "constants/species.h" struct MoveMons { diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 3d53f9ecc..f3898464c 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -11,7 +11,6 @@ #include "strings.h" #include "new_menu_helpers.h" #include "menu.h" -#include "constants/species.h" #include "constants/items.h" #include "data.h" #include "item.h" diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c index 7d154f815..ae61d68a6 100644 --- a/src/post_battle_event_funcs.c +++ b/src/post_battle_event_funcs.c @@ -5,7 +5,6 @@ #include "overworld.h" #include "hall_of_fame.h" #include "load_save.h" -#include "constants/flags.h" #include "constants/heal_locations.h" bool8 EnterHallOfFame(void) diff --git a/src/prof_pc.c b/src/prof_pc.c index c7eed8878..713912fe5 100644 --- a/src/prof_pc.c +++ b/src/prof_pc.c @@ -2,7 +2,6 @@ #include "event_data.h" #include "pokedex.h" #include "field_message_box.h" -#include "constants/species.h" extern const u8 PokedexRating_Text_LessThan10[]; extern const u8 PokedexRating_Text_LessThan20[]; diff --git a/src/quest_log.c b/src/quest_log.c index c149217d9..3ea558356 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -27,7 +27,6 @@ #include "constants/event_objects.h" #include "constants/maps.h" #include "constants/quest_log.h" -#include "constants/species.h" #include "constants/field_weather.h" #include "constants/event_object_movement.h" @@ -348,7 +347,7 @@ static void SetGameStateAtScene(u8 sceneNum) { struct QuestLog * questLog = &gSaveBlock1Ptr->questLog[sceneNum]; - CpuCopy16(gSaveBlock1Ptr->flags, questLog->flags, FLAGS_COUNT * sizeof(u8)); + CpuCopy16(gSaveBlock1Ptr->flags, questLog->flags, NUM_FLAG_BYTES * sizeof(u8)); CpuCopy16(gSaveBlock1Ptr->vars, questLog->vars, VARS_COUNT * sizeof(u16)); } @@ -584,7 +583,7 @@ void sub_81113E4(void) { struct QuestLog * questLog = &gSaveBlock1Ptr->questLog[sCurrentSceneNum]; - CpuCopy16(questLog->flags, gSaveBlock1Ptr->flags, FLAGS_COUNT * sizeof(u8)); + CpuCopy16(questLog->flags, gSaveBlock1Ptr->flags, NUM_FLAG_BYTES * sizeof(u8)); CpuCopy16(questLog->vars, gSaveBlock1Ptr->vars, VARS_COUNT * sizeof(u16)); sub_8111688(); } diff --git a/src/quest_log_battle.c b/src/quest_log_battle.c index fc3390508..f844d555e 100644 --- a/src/quest_log_battle.c +++ b/src/quest_log_battle.c @@ -1,6 +1,5 @@ #include "global.h" #include "gflib.h" -#include "constants/species.h" #include "battle.h" #include "battle_anim.h" #include "link.h" diff --git a/src/quest_log_events.c b/src/quest_log_events.c index a223804c4..8eaf331e5 100644 --- a/src/quest_log_events.c +++ b/src/quest_log_events.c @@ -14,9 +14,7 @@ #include "region_map.h" #include "strings.h" #include "constants/maps.h" -#include "constants/flags.h" #include "constants/trainer_classes.h" -#include "constants/species.h" #include "constants/items.h" #include "constants/region_map_sections.h" diff --git a/src/region_map.c b/src/region_map.c index ad152562b..c964fcf5a 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -12,7 +12,6 @@ #include "menu.h" #include "strings.h" #include "map_preview_screen.h" -#include "constants/flags.h" #include "constants/songs.h" #include "constants/region_map_sections.h" #include "constants/heal_locations.h" diff --git a/src/renewable_hidden_items.c b/src/renewable_hidden_items.c index c0406fe94..19eec3c29 100644 --- a/src/renewable_hidden_items.c +++ b/src/renewable_hidden_items.c @@ -2,7 +2,6 @@ #include "event_data.h" #include "random.h" #include "constants/maps.h" -#include "constants/flags.h" struct RenewableHiddenItemData { diff --git a/src/rfu_union_tool.c b/src/rfu_union_tool.c index 132ac7b85..21d095a9e 100644 --- a/src/rfu_union_tool.c +++ b/src/rfu_union_tool.c @@ -6,7 +6,6 @@ #include "rfu_union_tool.h" #include "script.h" #include "task.h" -#include "constants/flags.h" #include "constants/event_object_movement.h" #include "constants/union_room.h" #include "constants/event_objects.h" diff --git a/src/roamer.c b/src/roamer.c index f3e8bbccd..074ac22cf 100644 --- a/src/roamer.c +++ b/src/roamer.c @@ -2,7 +2,6 @@ #include "random.h" #include "overworld.h" #include "field_specials.h" -#include "constants/species.h" #include "constants/maps.h" #include "constants/region_map_sections.h" diff --git a/src/save_menu_util.c b/src/save_menu_util.c index 5f5f1f492..9bbb36d3d 100644 --- a/src/save_menu_util.c +++ b/src/save_menu_util.c @@ -4,7 +4,6 @@ #include "pokedex.h" #include "region_map.h" #include "save_menu_util.h" -#include "constants/flags.h" void SaveStatToString(u8 gameStatId, u8 *dest0, u8 color) { diff --git a/src/script_menu.c b/src/script_menu.c index 4e5ba905c..6a59fc8d4 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -11,7 +11,6 @@ #include "field_effect.h" #include "event_scripts.h" #include "constants/songs.h" -#include "constants/species.h" #include "constants/seagallop.h" #include "constants/menu.h" diff --git a/src/script_pokemon_util.c b/src/script_pokemon_util.c index f0bfad455..561621c1f 100644 --- a/src/script_pokemon_util.c +++ b/src/script_pokemon_util.c @@ -9,7 +9,6 @@ #include "pokedex.h" #include "script_pokemon_util.h" #include "constants/items.h" -#include "constants/species.h" #include "constants/pokemon.h" static void CB2_ReturnFromChooseHalfParty(void); diff --git a/src/start_menu.c b/src/start_menu.c index 1cc06aa99..6280ba7b4 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -35,7 +35,6 @@ #include "save_menu_util.h" #include "help_system.h" #include "constants/songs.h" -#include "constants/flags.h" #include "constants/field_weather.h" enum StartMenuOption diff --git a/src/title_screen.c b/src/title_screen.c index 673dd9ed3..9cb538f55 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -15,7 +15,6 @@ #include "berry_fix_program.h" #include "decompress.h" #include "constants/songs.h" -#include "constants/species.h" enum TitleScreenScene { diff --git a/src/trade_scene.c b/src/trade_scene.c index 9860fcc39..f068b17d4 100644 --- a/src/trade_scene.c +++ b/src/trade_scene.c @@ -28,7 +28,6 @@ #include "load_save.h" #include "random.h" #include "trade_scene.h" -#include "constants/species.h" #include "constants/items.h" #include "constants/easy_chat.h" #include "constants/songs.h" diff --git a/src/trainer_card.c b/src/trainer_card.c index 830625655..e42385243 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -17,10 +17,7 @@ #include "trainer_pokemon_sprites.h" #include "new_menu_helpers.h" #include "constants/songs.h" -#include "constants/flags.h" #include "constants/game_stat.h" -#include "constants/vars.h" -#include "constants/species.h" #include "constants/facility_trainer_classes.h" // Trainer Card Strings diff --git a/src/trainer_fan_club.c b/src/trainer_fan_club.c index 9040d3405..cdb5dac85 100644 --- a/src/trainer_fan_club.c +++ b/src/trainer_fan_club.c @@ -4,8 +4,6 @@ #include "event_data.h" #include "event_scripts.h" #include "random.h" -#include "constants/vars.h" -#include "constants/flags.h" struct TrainerFanClub { diff --git a/src/trainer_tower.c b/src/trainer_tower.c index 0d6f0f93e..36468a34d 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -12,12 +12,9 @@ #include "item.h" #include "menu.h" #include "new_menu_helpers.h" -#include "constants/vars.h" #include "constants/items.h" -#include "constants/species.h" #include "constants/songs.h" #include "constants/layouts.h" -#include "constants/trainers.h" #include "constants/facility_trainer_classes.h" #include "constants/event_objects.h" #include "constants/trainer_tower.h" diff --git a/src/union_room.c b/src/union_room.c index f123def90..772af688b 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -45,7 +45,6 @@ #include "constants/maps.h" #include "constants/cable_club.h" #include "constants/field_weather.h" -#include "constants/species.h" #include "constants/trainer_card.h" #include "constants/union_room.h" diff --git a/src/vs_seeker.c b/src/vs_seeker.c index b31b691dc..24e2b8c2f 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -21,7 +21,6 @@ #include "vs_seeker.h" #include "constants/event_object_movement.h" #include "constants/event_objects.h" -#include "constants/trainers.h" #include "constants/maps.h" #include "constants/items.h" #include "constants/quest_log.h" diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 5e1daaf36..4754d9d4f 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -12,9 +12,7 @@ #include "script.h" #include "link.h" #include "quest_log.h" -#include "constants/species.h" #include "constants/maps.h" -#include "constants/vars.h" #include "constants/abilities.h" #include "constants/items.h" diff --git a/src/wild_pokemon_area.c b/src/wild_pokemon_area.c index b2efb107d..0cb4a10b1 100644 --- a/src/wild_pokemon_area.c +++ b/src/wild_pokemon_area.c @@ -5,9 +5,7 @@ #include "roamer.h" #include "overworld.h" #include "pokedex_area_markers.h" -#include "constants/vars.h" #include "constants/region_map_sections.h" -#include "constants/species.h" struct SeviiDexArea { |