dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use trainer constants in flags, automatically update flags/vars count

Browse Source
This commit is contained in:
GriffinR
2021-01-29 15:37:52 -05:00
parent 419c897292
commit 1f6dc0e86b
88 changed files with 929 additions and 945 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_ai_script_commands.c
-1
View File
@@ -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"
src/battle_ai_switch_items.c
-1
View File
@@ -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);
src/battle_anim_effects_3.c
-1
View File
@@ -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
src/battle_anim_mons.c
-1
View File
@@ -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) \
src/battle_anim_sound_tasks.c
-1
View File
@@ -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);
src/battle_controller_pokedude.c
-1
View File
@@ -20,7 +20,6 @@
#include "constants/songs.h"
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/trainers.h"
struct Unk_84790E8
{
src/battle_controllers.c
-1
View File
@@ -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;
src/battle_gfx_sfx_util.c
-1
View File
@@ -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"
src/battle_intro.c
-1
View File
@@ -6,7 +6,6 @@
#include "scanline_effect.h"
#include "task.h"
#include "trig.h"
#include "constants/trainers.h"
static EWRAM_DATA u16 sBgCnt = 0;
src/battle_main.c
-2
View File
@@ -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);
src/battle_script_commands.c
-2
View File
@@ -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))
src/battle_setup.c
+5 -8
View File
@@ -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)
src/battle_tower.c
-2
View File
@@ -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;
src/battle_util.c
-2
View File
@@ -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"
src/credits.c
-1
View File
@@ -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"
src/data.c
-2
View File
@@ -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"
src/data/easy_chat/easy_chat_group_pokemon.h
-2
View File
@@ -1,5 +1,3 @@
#include "constants/species.h"
static const u16 sEasyChatGroup_Pokemon[] = {
SPECIES_ABRA,
SPECIES_ABSOL,
src/data/easy_chat/easy_chat_group_pokemon2.h
-2
View File
@@ -1,5 +1,3 @@
#include "constants/species.h"
static const u16 sEasyChatGroup_Pokemon2[] = {
SPECIES_ABRA,
SPECIES_AERODACTYL,
src/daycare.c
-1
View File
@@ -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"
src/decompress.c
-1
View File
@@ -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[];
src/dodrio_berry_picking.c
-1
View File
@@ -15,7 +15,6 @@
#include "constants/songs.h"
#include "constants/fanfares.h"
#include "constants/items.h"
#include "constants/species.h"
struct DodrioStruct
{
src/easy_chat.c
-2
View File
@@ -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
{
src/event_data.c
+1 -1
View File
@@ -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);
}
src/evolution_scene.c
-1
View File
@@ -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"
src/fame_checker.c
-1
View File
@@ -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
src/field_player_avatar.c
-2
View File
@@ -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;
src/field_poison.c
-1
View File
@@ -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)
src/field_specials.c
-1
View File
@@ -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"
src/field_tasks.c
-2
View File
@@ -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
src/hall_of_fame.c
-3
View File
@@ -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
src/heal_location.c
-1
View File
@@ -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"
src/intro.c
-1
View File
@@ -14,7 +14,6 @@
#include "util.h"
#include "trig.h"
#include "constants/songs.h"
#include "constants/species.h"
struct IntroSequenceData;
src/item_use.c
-1
View File
@@ -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"
src/link_rfu_2.c
-1
View File
@@ -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
src/link_rfu_3.c
-1
View File
@@ -5,7 +5,6 @@
#include "link.h"
#include "link_rfu.h"
#include "random.h"
#include "constants/flags.h"
static EWRAM_DATA u8 gWirelessStatusIndicatorSpriteId = 0;
src/mail.c
-1
View File
@@ -18,7 +18,6 @@
#include "string_util.h"
#include "strings.h"
#include "constants/items.h"
#include "constants/species.h"
enum MailIconParam
{
src/mail_data.c
-1
View File
@@ -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"
src/map_name_popup.c
-1
View File
@@ -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);
src/menu2.c
-1
View File
@@ -2,7 +2,6 @@
#include "gflib.h"
#include "task.h"
#include "wild_encounter.h"
#include "constants/species.h"
static void Task_SmoothBlendLayers(u8 taskId);
src/mevent.c
-1
View File
@@ -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"
src/mevent_show_card.c
-1
View File
@@ -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"
src/mystery_event_script.c
-1
View File
@@ -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"
src/naming_screen.c
-1
View File
@@ -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"
src/oak_speech.c
-1
View File
@@ -15,7 +15,6 @@
#include "overworld.h"
#include "random.h"
#include "data.h"
#include "constants/species.h"
#include "constants/songs.h"
struct OakSpeechResources
src/overworld.c
-2
View File
@@ -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"
src/party_menu.c
-2
View File
@@ -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)
src/pokedex.c
-1
View File
@@ -1,7 +1,6 @@
#include "global.h"
#include "pokedex.h"
#include "pokedex_screen.h"
#include "constants/species.h"
const u8 *sub_8088E20(u16 dexNum)
{
src/pokedex_screen.c
-1
View File
@@ -16,7 +16,6 @@
#include "pokedex.h"
#include "trainer_pokemon_sprites.h"
#include "constants/songs.h"
#include "constants/species.h"
struct PokedexScreenData
{
src/pokemon.c
+6 -8
View File
@@ -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;
src/pokemon_icon.c
-1
View File
@@ -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
src/pokemon_jump_2.c
-1
View File
@@ -9,7 +9,6 @@
#include "task.h"
#include "pokemon_jump.h"
#include "constants/songs.h"
#include "constants/species.h"
struct PokemonJump1
{
src/pokemon_size_record.c
-1
View File
@@ -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
src/pokemon_storage_system.c
-1
View File
@@ -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)
{
src/pokemon_storage_system_2.c
-1
View File
@@ -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"
src/pokemon_storage_system_3.c
-2
View File
@@ -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;
src/pokemon_storage_system_4.c
-3
View File
@@ -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);
src/pokemon_storage_system_7.c
-1
View File
@@ -4,7 +4,6 @@
#include "pokemon_icon.h"
#include "pokemon_storage_system_internal.h"
#include "text_window.h"
#include "constants/species.h"
struct MoveMons
{
src/pokemon_summary_screen.c
-1
View File
@@ -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"
src/post_battle_event_funcs.c
-1
View File
@@ -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)
src/prof_pc.c
-1
View File
@@ -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[];
src/quest_log.c
+2 -3
View File
@@ -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();
}
src/quest_log_battle.c
-1
View File
@@ -1,6 +1,5 @@
#include "global.h"
#include "gflib.h"
#include "constants/species.h"
#include "battle.h"
#include "battle_anim.h"
#include "link.h"
src/quest_log_events.c
-2
View File
@@ -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"
src/region_map.c
-1
View File
@@ -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"
src/renewable_hidden_items.c
-1
View File
@@ -2,7 +2,6 @@
#include "event_data.h"
#include "random.h"
#include "constants/maps.h"
#include "constants/flags.h"
struct RenewableHiddenItemData
{
src/rfu_union_tool.c
-1
View File
@@ -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"
src/roamer.c
-1
View File
@@ -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"
src/save_menu_util.c
-1
View File
@@ -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)
{
src/script_menu.c
-1
View File
@@ -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"
src/script_pokemon_util.c
-1
View File
@@ -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);
src/start_menu.c
-1
View File
@@ -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
src/title_screen.c
-1
View File
@@ -15,7 +15,6 @@
#include "berry_fix_program.h"
#include "decompress.h"
#include "constants/songs.h"
#include "constants/species.h"
enum TitleScreenScene
{
src/trade_scene.c
-1
View File
@@ -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"
src/trainer_card.c
-3
View File
@@ -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
src/trainer_fan_club.c
-2
View File
@@ -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
{
src/trainer_tower.c
-3
View File
@@ -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"
src/union_room.c
-1
View File
@@ -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"
src/vs_seeker.c
-1
View File
@@ -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"
src/wild_encounter.c
-2
View File
@@ -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"
src/wild_pokemon_area.c
-2
View File
@@ -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
{