Replace POKEMON_SLOTS_NUMBER

This commit is contained in:
GriffinR 2020-10-01 17:20:38 -04:00 committed by huderlem
parent 22c6c03429
commit 5259898325
82 changed files with 2 additions and 86 deletions

View File

@ -2,7 +2,6 @@
#define GUARD_DATA_H
#include "constants/moves.h"
#include "constants/species.h"
#define SPECIES_SHINY_TAG 500

View File

@ -8,6 +8,7 @@
#include "constants/global.h"
#include "constants/flags.h"
#include "constants/vars.h"
#include "constants/species.h"
// Prevent cross-jump optimization.
#define BLOCK_CROSS_JUMP asm("");
@ -65,8 +66,6 @@
// Converts a Q24.8 fixed-point format number to a regular integer
#define Q_24_8_TO_INT(n) ((int)((n) >> 8))
#define POKEMON_SLOTS_NUMBER 412
#define min(a, b) ((a) < (b) ? (a) : (b))
#define max(a, b) ((a) >= (b) ? (a) : (b))
@ -115,7 +114,7 @@
#define ROUND_BITS_TO_BYTES(numBits)(((numBits) / 8) + (((numBits) % 8) ? 1 : 0))
#define DEX_FLAGS_NO (ROUND_BITS_TO_BYTES(POKEMON_SLOTS_NUMBER))
#define DEX_FLAGS_NO (ROUND_BITS_TO_BYTES(NUM_SPECIES))
#define NUM_FLAG_BYTES (ROUND_BITS_TO_BYTES(FLAGS_COUNT))
struct Coords8

View File

@ -27,7 +27,6 @@
#include "constants/items.h"
#include "constants/pokemon.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "constants/moves.h"

View File

@ -14,7 +14,6 @@
#include "constants/battle_ai.h"
#include "constants/battle_move_effects.h"
#include "constants/moves.h"
#include "constants/species.h"
#define AI_ACTION_DONE 0x0001
#define AI_ACTION_FLEE 0x0002

View File

@ -9,7 +9,6 @@
#include "constants/item_effects.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
// this file's functions
static bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng);

View File

@ -21,7 +21,6 @@
#include "constants/battle_anim.h"
#include "constants/rgb.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/weather.h"
extern const struct SpriteTemplate gThoughtBubbleSpriteTemplate;

View File

@ -15,7 +15,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) \

View File

@ -5,7 +5,6 @@
#include "sound.h"
#include "task.h"
#include "constants/battle_anim.h"
#include "constants/species.h"
// this file's functions
static void sub_8158B98(u8 taskId);

View File

@ -13,7 +13,6 @@
#include "task.h"
#include "util.h"
#include "constants/abilities.h"
#include "constants/species.h"
static EWRAM_DATA u8 sLinkSendTaskId = 0;
static EWRAM_DATA u8 sLinkReceiveTaskId = 0;

View File

@ -33,7 +33,6 @@
#include "graphics.h"
#include "constants/battle_dome.h"
#include "constants/frontier_util.h"
#include "constants/species.h"
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/trainers.h"

View File

@ -8,7 +8,6 @@
#include "frontier_util.h"
#include "battle_tower.h"
#include "random.h"
#include "constants/species.h"
#include "constants/battle_ai.h"
#include "constants/battle_factory.h"
#include "constants/battle_frontier.h"

View File

@ -17,7 +17,6 @@
#include "sound.h"
#include "party_menu.h"
#include "m4a.h"
#include "constants/species.h"
#include "decompress.h"
#include "data.h"
#include "palette.h"

View File

@ -15,7 +15,6 @@
#include "util.h"
#include "gpu_regs.h"
#include "battle_message.h"
#include "constants/species.h"
#include "pokedex.h"
#include "palette.h"
#include "international_string_util.h"

View File

@ -58,7 +58,6 @@
#include "constants/party_menu.h"
#include "constants/rgb.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "cable_club.h"

View File

@ -21,7 +21,6 @@
#include "constants/layouts.h"
#include "constants/rgb.h"
#include "constants/trainers.h"
#include "constants/species.h"
#include "constants/moves.h"
#include "constants/party_menu.h"
#include "constants/battle_pike.h"

View File

@ -35,7 +35,6 @@
#include "constants/layouts.h"
#include "constants/maps.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/trainers.h"
extern const struct MapLayout *const gMapLayouts[];

View File

@ -16,7 +16,6 @@
#include "random.h"
#include "battle_controllers.h"
#include "battle_interface.h"
#include "constants/species.h"
#include "constants/songs.h"
#include "constants/trainers.h"
#include "constants/battle_anim.h"

View File

@ -44,7 +44,6 @@
#include "constants/songs.h"
#include "constants/map_types.h"
#include "constants/maps.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "constants/trainer_hill.h"

View File

@ -17,7 +17,6 @@
#include "constants/items.h"
#include "constants/layouts.h"
#include "constants/region_map_sections.h"
#include "constants/species.h"
#include "constants/trainers.h"
// This file's functions.

View File

@ -35,7 +35,6 @@
#include "constants/trainers.h"
#include "constants/event_objects.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/easy_chat.h"
#include "constants/tv.h"

View File

@ -6,7 +6,6 @@
#include "constants/battle_string_ids.h"
#include "constants/battle_anim.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "battle_message.h"
#include "tv.h"

View File

@ -21,7 +21,6 @@
#include "constants/hold_effects.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/weather.h"
#include "battle_arena.h"
#include "battle_pyramid.h"

View File

@ -2,7 +2,6 @@
#include "event_data.h"
#include "field_message_box.h"
#include "pokedex.h"
#include "constants/species.h"
#include "strings.h"
bool16 ScriptGetPokedexInfo(void)

View File

@ -8,7 +8,6 @@
#include "constants/field_effects.h"
#include "constants/maps.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/metatile_labels.h"
#include "fieldmap.h"
#include "party_menu.h"

View File

@ -42,7 +42,6 @@
#include "constants/moves.h"
#include "constants/rgb.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/tv.h"
// This file's functions.

View File

@ -22,7 +22,6 @@
#include "pokedex.h"
#include "event_data.h"
#include "random.h"
#include "constants/species.h"
enum
{

View File

@ -5,7 +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"

View File

@ -1,6 +1,5 @@
#ifndef GUARD_DATA_BARD_MUSIC_POKEMON_H
#define GUARD_DATA_BARD_MUSIC_POKEMON_H
#include "constants/species.h"
const u16 gNumSpeciesNames = NUM_SPECIES;

View File

@ -1,7 +1,6 @@
#include "global.h"
#include "contest.h"
#include "constants/species.h"
#define CONTEST_OPPONENT_JIMMY 0
#define CONTEST_OPPONENT_EDITH 1

View File

@ -1,5 +1,3 @@
#include "constants/species.h"
const u16 gEasyChatGroup_Pokemon[] = {
SPECIES_ABRA,
SPECIES_ABSOL,

View File

@ -1,5 +1,3 @@
#include "constants/species.h"
const u16 gEasyChatGroup_Pokemon2[] = {
SPECIES_ABRA,
SPECIES_AERODACTYL,

View File

@ -1,7 +1,6 @@
#include "constants/easy_chat.h"
#include "constants/event_objects.h"
#include "constants/items.h"
#include "constants/species.h"
#include "constants/moves.h"
static const u16 sContestLadyMonGfxId[] =

View File

@ -22,7 +22,6 @@
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/region_map_sections.h"
#include "constants/species.h"
// this file's functions
static void ClearDaycareMonMail(struct DayCareMail *mail);

View File

@ -4,7 +4,6 @@
#include "decompress.h"
#include "pokemon.h"
#include "text.h"
#include "constants/species.h"
EWRAM_DATA ALIGNED(4) u8 gDecompressionBuffer[0x4000] = {0};

View File

@ -24,7 +24,6 @@
#include "window.h"
#include "constants/items.h"
#include "constants/songs.h"
#include "constants/species.h"
struct DodrioSubstruct_0160
{

View File

@ -32,7 +32,6 @@
#include "constants/lilycove_lady.h"
#include "constants/mauville_old_man.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/rgb.h"
#define EZCHAT_TASK_STATE 0

View File

@ -12,7 +12,6 @@
#include "trainer_hill.h"
#include "constants/easy_chat.h"
#include "constants/trainers.h"
#include "constants/species.h"
#include "constants/moves.h"
#include "constants/items.h"

View File

@ -30,7 +30,6 @@
#include "trade.h"
#include "util.h"
#include "constants/battle_string_ids.h"
#include "constants/species.h"
#include "constants/songs.h"
#include "constants/rgb.h"

View File

@ -29,7 +29,6 @@
#include "constants/maps.h"
#include "constants/moves.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/trainer_types.h"
static EWRAM_DATA u8 gUnknown_0203734C = 0;

View File

@ -16,7 +16,6 @@
#include "trainer_hill.h"
#include "constants/field_poison.h"
#include "constants/party_menu.h"
#include "constants/species.h"
static bool32 IsMonValidSpecies(struct Pokemon *pokemon)
{

View File

@ -60,7 +60,6 @@
#include "constants/script_menu.h"
#include "constants/slot_machine.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/moves.h"
#include "constants/party_menu.h"
#include "constants/battle_frontier.h"

View File

@ -31,7 +31,6 @@
#include "constants/battle_frontier.h"
#include "constants/frontier_util.h"
#include "constants/trainers.h"
#include "constants/species.h"
#include "constants/game_stat.h"
#include "constants/moves.h"
#include "constants/items.h"

View File

@ -18,7 +18,6 @@
#include "window.h"
#include "credits.h"
#include "bg.h"
#include "constants/species.h"
#include "constants/game_stat.h"
#include "util.h"
#include "string_util.h"

View File

@ -21,7 +21,6 @@
#include "intro.h"
#include "graphics.h"
#include "sound.h"
#include "constants/species.h"
#include "util.h"
#include "title_screen.h"
#include "constants/rgb.h"

View File

@ -15,7 +15,6 @@
#include "string_util.h"
#include "task.h"
#include "text.h"
#include "constants/species.h"
#include "save.h"
#include "mystery_gift.h"

View File

@ -4,7 +4,6 @@
#include "pokemon.h"
#include "constants/items.h"
#include "random.h"
#include "constants/species.h"
#include "string_util.h"
#include "text.h"
#include "pokemon_storage_system.h"

View File

@ -16,7 +16,6 @@
#include "gpu_regs.h"
#include "bg.h"
#include "pokemon_icon.h"
#include "constants/species.h"
#include "malloc.h"
#include "easy_chat.h"
#include "constants/rgb.h"

View File

@ -3,7 +3,6 @@
#include "constants/items.h"
#include "pokemon.h"
#include "pokemon_icon.h"
#include "constants/species.h"
#include "text.h"
#include "international_string_util.h"

View File

@ -3,7 +3,6 @@
#include "bg.h"
#include "constants/rgb.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "decompress.h"
#include "event_data.h"

View File

@ -32,7 +32,6 @@
#include "constants/maps.h"
#include "constants/region_map_sections.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/trainers.h"
struct MatchCallState

View File

@ -25,7 +25,6 @@
#include "window.h"
#include "constants/berry.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "gba/io_reg.h"
extern const struct CompressedSpriteSheet gMonFrontPicTable[];

View File

@ -10,7 +10,6 @@
#include "new_game.h"
#include "mevent.h"
#include "constants/mevent.h"
#include "constants/species.h"
static EWRAM_DATA bool32 gUnknown_02022C70 = FALSE;

View File

@ -1,5 +1,4 @@
#include "global.h"
#include "constants/species.h"
#include "bg.h"
#include "gpu_regs.h"
#include "palette.h"

View File

@ -9,7 +9,6 @@
#include "pokemon.h"
#include "pokemon_size_record.h"
#include "script.h"
#include "constants/species.h"
#include "strings.h"
#include "string_util.h"
#include "text.h"

View File

@ -65,7 +65,6 @@
#include "constants/maps.h"
#include "constants/region_map_sections.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/trainer_hill.h"
#include "constants/weather.h"

View File

@ -74,7 +74,6 @@
#include "constants/party_menu.h"
#include "constants/rgb.h"
#include "constants/songs.h"
#include "constants/species.h"
#define PARTY_PAL_SELECTED (1 << 0)
#define PARTY_PAL_FAINTED (1 << 1)

View File

@ -13,7 +13,6 @@
#include "trig.h"
#include "util.h"
#include "constants/songs.h"
#include "constants/species.h"
extern struct MusicPlayerInfo gMPlayInfo_BGM;

View File

@ -28,7 +28,6 @@
#include "window.h"
#include "constants/rgb.h"
#include "constants/songs.h"
#include "constants/species.h"
enum
{

View File

@ -20,7 +20,6 @@
#include "constants/region_map_sections.h"
#include "constants/rgb.h"
#include "constants/songs.h"
#include "constants/species.h"
#define AREA_SCREEN_WIDTH 32
#define AREA_SCREEN_HEIGHT 20

View File

@ -44,7 +44,6 @@
#include "constants/layouts.h"
#include "constants/moves.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/trainers.h"
struct SpeciesItem

View File

@ -8,7 +8,6 @@
#include "util.h"
#include "constants/battle_anim.h"
#include "constants/rgb.h"
#include "constants/species.h"
struct UnkAnimStruct
{

View File

@ -4,7 +4,6 @@
#include "palette.h"
#include "pokemon_icon.h"
#include "sprite.h"
#include "constants/species.h"
#define POKE_ICON_BASE_PAL_TAG 56000

View File

@ -29,7 +29,6 @@
#include "pokemon_jump.h"
#include "constants/rgb.h"
#include "constants/songs.h"
#include "constants/species.h"
struct PokemonJump1_MonInfo
{

View File

@ -6,7 +6,6 @@
#include "pokemon_size_record.h"
#include "string_util.h"
#include "text.h"
#include "constants/species.h"
#define DEFAULT_MAX_SIZE 0x8000 // was 0x8100 in Ruby/Sapphire

View File

@ -41,7 +41,6 @@
#include "constants/moves.h"
#include "constants/rgb.h"
#include "constants/songs.h"
#include "constants/species.h"
struct WallpaperTable
{

View File

@ -46,7 +46,6 @@
#include "constants/region_map_sections.h"
#include "constants/rgb.h"
#include "constants/songs.h"
#include "constants/species.h"
// Screen titles (upper left)
#define PSS_LABEL_WINDOW_POKEMON_INFO_TITLE 0

View File

@ -12,7 +12,6 @@
#include "strings.h"
#include "text.h"
#include "constants/songs.h"
#include "constants/species.h"
struct PokenavSub11
{

View File

@ -23,7 +23,6 @@
#include "constants/game_stat.h"
#include "constants/region_map_sections.h"
#include "constants/songs.h"
#include "constants/species.h"
struct Pokenav4Struct
{

View File

@ -14,7 +14,6 @@
#include "decompress.h"
#include "sound.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/rgb.h"
#include "random.h"

View File

@ -5,7 +5,6 @@
#include "text.h"
#include "item.h"
#include "task.h"
#include "constants/species.h"
#include "save.h"
#include "load_save.h"
#include "pokemon.h"

View File

@ -11,7 +11,6 @@
#include "battle_controllers.h"
#include "link.h"
#include "sprite.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "battle_interface.h"
#include "battle_anim.h"

View File

@ -4,7 +4,6 @@
#include "random.h"
#include "roamer.h"
#include "constants/maps.h"
#include "constants/species.h"
enum
{

View File

@ -30,7 +30,6 @@
#include "constants/coins.h"
#include "constants/rgb.h"
#include "constants/roulette.h"
#include "constants/species.h"
#include "constants/songs.h"
#define BALLS_PER_ROUND 6

View File

@ -22,7 +22,6 @@
#include "string_util.h"
#include "tv.h"
#include "constants/items.h"
#include "constants/species.h"
#include "constants/tv.h"
#include "constants/battle_frontier.h"

View File

@ -46,7 +46,6 @@
#include "constants/moves.h"
#include "constants/secret_bases.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "constants/tv.h"

View File

@ -22,7 +22,6 @@
#include "trig.h"
#include "window.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/rgb.h"
#define STARTER_MON_COUNT 3

View File

@ -49,7 +49,6 @@
#include "constants/moves.h"
#include "constants/region_map_sections.h"
#include "constants/rgb.h"
#include "constants/species.h"
#include "constants/songs.h"
#include "constants/union_room.h"

View File

@ -29,7 +29,6 @@
#include "constants/layouts.h"
#include "constants/moves.h"
#include "constants/maps.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "constants/easy_chat.h"
#include "constants/trainer_hill.h"

View File

@ -2,7 +2,6 @@
#include "sprite.h"
#include "window.h"
#include "malloc.h"
#include "constants/species.h"
#include "palette.h"
#include "decompress.h"
#include "trainer_pokemon_sprites.h"

View File

@ -42,7 +42,6 @@
#include "constants/moves.h"
#include "constants/region_map_sections.h"
#include "constants/script_menu.h"
#include "constants/species.h"
#include "constants/tv.h"
// Static type declarations

View File

@ -52,7 +52,6 @@
#include "constants/party_menu.h"
#include "constants/rgb.h"
#include "constants/songs.h"
#include "constants/species.h"
// States for Task_RunUnionRoom
enum {

View File

@ -21,7 +21,6 @@
#include "constants/items.h"
#include "constants/layouts.h"
#include "constants/maps.h"
#include "constants/species.h"
#include "constants/weather.h"
extern const u8 EventScript_RepelWoreOff[];