atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removing data

Browse source
This commit is contained in:
Eduardo Quezada 2022-11-21 12:17:53 -03:00
parent aedaf3f45f
commit 50117e8b4f
25 changed files with 65 additions and 13277 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/constants/species.h
View file

@ -1382,7 +1382,7 @@
#define SPECIES_GARBODOR_GIGANTAMAX 1307 #define SPECIES_GARBODOR_GIGANTAMAX 1307
#define SPECIES_STUNFISK_GALARIAN 1308 #define SPECIES_STUNFISK_GALARIAN 1308
#define SPECIES_MELMETAL_GIGANTAMAX 1309 #define SPECIES_MELMETAL_GIGANTAMAX 1309
// Sword and Shield 1.0.0 (New Forms) // Sword and Shield 1.1.0 (New Forms)
#define SPECIES_SLOWPOKE_GALARIAN 1310 #define SPECIES_SLOWPOKE_GALARIAN 1310
// The Isle of Armor (New Species) // The Isle of Armor (New Species)
#define SPECIES_KUBFU 1311 #define SPECIES_KUBFU 1311

2
include/data.h
View file

@ -117,8 +117,6 @@ extern const struct MonCoords gTrainerBackPicCoords[];
extern const struct CompressedSpriteSheet gTrainerBackPicTable[]; // functionally unused extern const struct CompressedSpriteSheet gTrainerBackPicTable[]; // functionally unused
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
extern const u8 gEnemyMonElevation[NUM_SPECIES];
extern const struct Trainer gTrainers[]; extern const struct Trainer gTrainers[];
extern const u8 gTrainerClassNames[][13]; extern const u8 gTrainerClassNames[][13];
extern const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1]; extern const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1];

13
include/pokemon.h
View file

@ -324,7 +324,7 @@ struct BaseStats
/* 0x?? */ u8 eggGroup2; /* 0x?? */ u8 eggGroup2;
/* 0x?? */ u16 abilities[NUM_ABILITY_SLOTS]; /* 0x?? */ u16 abilities[NUM_ABILITY_SLOTS];
/* 0x?? */ u8 safariZoneFleeRate; /* 0x?? */ u8 safariZoneFleeRate;
// Pokédex data // Pokédex data
/* 0x?? */ u8 categoryName[13]; /* 0x?? */ u8 categoryName[13];
/* 0x?? */ u16 natDexNum; /* 0x?? */ u16 natDexNum;
/* 0x?? */ u16 hoennDexNum; /* 0x?? */ u16 hoennDexNum;
@ -353,14 +353,15 @@ struct BaseStats
const u8 *const iconSprite; const u8 *const iconSprite;
const u8 *const iconSpriteFemale; const u8 *const iconSpriteFemale;
const u8 *const footprint; const u8 *const footprint;
u8 frontPicSize; // All Pokémon pics are 64x64, but this data table defines where in this 64x64 frame the sprite's non-transparent pixels actually are.
u8 frontPicYOffset; u8 frontPicSize; // The dimensions of this drawn pixel area.
u8 backPicSize; u8 frontPicYOffset; // The number of pixels between the drawn pixel area and the bottom edge.
u8 backPicYOffset; u8 backPicSize; // The dimensions of this drawn pixel area.
u8 backPicYOffset; // The number of pixels between the drawn pixel area and the bottom edge.
u8 iconPalIndex:3; u8 iconPalIndex:3;
u8 iconPalIndexFemale:3; u8 iconPalIndexFemale:3;
u8 padding2:2; u8 padding2:2;
u8 enemyMonElevation; u8 enemyMonElevation; // This determines how much higher above the usual position the enemy Pokémon is during battle. Species that float or fly have nonzero values.
// Flags // Flags
/* 0x?? */ u16 flags; /* 0x?? */ u16 flags;
// Move Data // Move Data

1
include/pokemon_icon.h
View file

@ -1,7 +1,6 @@
#ifndef GUARD_POKEMON_ICON_H #ifndef GUARD_POKEMON_ICON_H
#define GUARD_POKEMON_ICON_H #define GUARD_POKEMON_ICON_H
extern const u8 *const gMonIconTable[];
extern const struct SpritePalette gMonIconPaletteTable[]; extern const struct SpritePalette gMonIconPaletteTable[];
const u8 *GetMonIconTiles(u16 species, u32 personality); const u8 *GetMonIconTiles(u16 species, u32 personality);

4
src/battle_anim_mons.c
View file

@ -257,9 +257,9 @@ u8 GetBattlerElevation(u8 battlerId, u16 species)
if (species == SPECIES_CASTFORM) if (species == SPECIES_CASTFORM)
ret = sCastformElevations[gBattleMonForms[battlerId]]; ret = sCastformElevations[gBattleMonForms[battlerId]];
else if (species > NUM_SPECIES) else if (species > NUM_SPECIES)
ret = gEnemyMonElevation[0]; ret = gBaseStats[SPECIES_NONE].enemyMonElevation;
else else
ret = gEnemyMonElevation[species]; ret = gBaseStats[species].enemyMonElevation;
} }
} }
return ret; return ret;

4
src/battle_gfx_sfx_util.c
View file

@ -1137,7 +1137,7 @@ void SpriteCB_EnemyShadow(struct Sprite *shadowSprite)
if (gAnimScriptActive || battlerSprite->invisible) if (gAnimScriptActive || battlerSprite->invisible)
invisible = TRUE; invisible = TRUE;
else if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE else if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE
&& gEnemyMonElevation[gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies] == 0) && gBaseStats[gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies].enemyMonElevation == 0)
invisible = TRUE; invisible = TRUE;
if (gBattleSpritesDataPtr->battlerData[battlerId].behindSubstitute) if (gBattleSpritesDataPtr->battlerData[battlerId].behindSubstitute)
@ -1164,7 +1164,7 @@ void SetBattlerShadowSpriteCallback(u8 battlerId, u16 species)
if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE) if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE)
species = gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies; species = gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies;
if (gEnemyMonElevation[species] != 0) if (gBaseStats[species].enemyMonElevation != 0)
gSprites[gBattleSpritesDataPtr->healthBoxesData[battlerId].shadowSpriteId].callback = SpriteCB_EnemyShadow; gSprites[gBattleSpritesDataPtr->healthBoxesData[battlerId].shadowSpriteId].callback = SpriteCB_EnemyShadow;
else else
gSprites[gBattleSpritesDataPtr->healthBoxesData[battlerId].shadowSpriteId].callback = SpriteCB_SetInvisible; gSprites[gBattleSpritesDataPtr->healthBoxesData[battlerId].shadowSpriteId].callback = SpriteCB_SetInvisible;

4
src/data.c
View file

@ -302,9 +302,6 @@ const union AnimCmd *const gAnims_MonPic[] =
#define SPECIES_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species} #define SPECIES_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species}
#define SPECIES_SHINY_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species + SPECIES_SHINY_TAG} #define SPECIES_SHINY_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species + SPECIES_SHINY_TAG}
#include "data/pokemon_graphics/front_pic_coordinates.h"
#include "data/pokemon_graphics/back_pic_coordinates.h"
#include "data/pokemon_graphics/back_pic_table.h" #include "data/pokemon_graphics/back_pic_table.h"
#include "data/pokemon_graphics/palette_table.h" #include "data/pokemon_graphics/palette_table.h"
#include "data/pokemon_graphics/shiny_palette_table.h" #include "data/pokemon_graphics/shiny_palette_table.h"
@ -314,7 +311,6 @@ const union AnimCmd *const gAnims_MonPic[] =
#include "data/trainer_graphics/back_pic_anims.h" #include "data/trainer_graphics/back_pic_anims.h"
#include "data/trainer_graphics/back_pic_tables.h" #include "data/trainer_graphics/back_pic_tables.h"
#include "data/pokemon_graphics/enemy_mon_elevation.h"
//#include "data/pokemon_graphics/front_pic_anims.h" //#include "data/pokemon_graphics/front_pic_anims.h"
#include "data/pokemon_graphics/front_pic_table.h" #include "data/pokemon_graphics/front_pic_table.h"

79
src/data/pokemon/base_stats.h
View file

@ -55,6 +55,7 @@ const struct BaseStats gBaseStats[] =
{ {
[SPECIES_NONE] = [SPECIES_NONE] =
{ {
.speciesName = _("??????????"),
DEX_TEXT(Dummy, "Unknown"), DEX_TEXT(Dummy, "Unknown"),
DEX_SCALE(256, 0, 256, 0), DEX_SCALE(256, 0, 256, 0),
HEIGHT_WEIGHT(0, 0), HEIGHT_WEIGHT(0, 0),
@ -68,7 +69,6 @@ const struct BaseStats gBaseStats[] =
[SPECIES_BULBASAUR] = [SPECIES_BULBASAUR] =
{ {
.speciesName = _("Bulbasaur"),
.baseHP = 45, .baseHP = 45,
.baseAttack = 49, .baseAttack = 49,
.baseDefense = 49, .baseDefense = 49,
@ -89,6 +89,7 @@ const struct BaseStats gBaseStats[] =
.abilities = {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_CHLOROPHYLL}, .abilities = {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_CHLOROPHYLL},
.bodyColor = BODY_COLOR_GREEN, .bodyColor = BODY_COLOR_GREEN,
.noFlip = FALSE, .noFlip = FALSE,
.speciesName = _("Bulbasaur"),
.natDexNum = NATIONAL_DEX_BULBASAUR, .natDexNum = NATIONAL_DEX_BULBASAUR,
DEX_TEXT(Bulbasaur, "Seed"), DEX_TEXT(Bulbasaur, "Seed"),
DEX_SCALE(356, 17, 256, 0), DEX_SCALE(356, 17, 256, 0),
@ -125,14 +126,18 @@ const struct BaseStats gBaseStats[] =
.abilities = {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_CHLOROPHYLL}, .abilities = {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_CHLOROPHYLL},
.bodyColor = BODY_COLOR_GREEN, .bodyColor = BODY_COLOR_GREEN,
.noFlip = FALSE, .noFlip = FALSE,
.categoryName = _("Seed"), .speciesName = _("Ivysaur"),
.height = 10, .natDexNum = NATIONAL_DEX_IVYSAUR,
.weight = 130, DEX_TEXT(Ivysaur, "Seed"),
.description = gIvysaurPokedexText, DEX_SCALE(335, 13, 256, 0),
.pokemonScale = 335, HEIGHT_WEIGHT(10, 130),
.pokemonOffset = 13, LEARNSETS(Ivysaur),
.trainerScale = 256, FRONT_SPRITE(Ivysaur, 56, 48, 9, 0),
.trainerOffset = 0, BACK_SPRITE (Ivysaur, 64, 56, 9),
PALETTES(Ivysaur),
ICON(Ivysaur, 4),
FOOTPRINT(Ivysaur),
ANIMATIONS(IVYSAUR, 0, ANIM_V_STRETCH, BACK_ANIM_H_SLIDE),
}, },
#define VENUSAUR_MISC_STATS \ #define VENUSAUR_MISC_STATS \
@ -149,7 +154,10 @@ const struct BaseStats gBaseStats[] =
.eggGroup2 = EGG_GROUP_GRASS, \ .eggGroup2 = EGG_GROUP_GRASS, \
.bodyColor = BODY_COLOR_GREEN, \ .bodyColor = BODY_COLOR_GREEN, \
.noFlip = FALSE, \ .noFlip = FALSE, \
.categoryName = _("Seed") .speciesName = _("Venusaur"), \
.natDexNum = NATIONAL_DEX_VENUSAUR, \
LEARNSETS(Venusaur), \
FOOTPRINT(Venusaur)
[SPECIES_VENUSAUR] = [SPECIES_VENUSAUR] =
{ {
@ -161,13 +169,14 @@ const struct BaseStats gBaseStats[] =
.baseSpDefense = 100, .baseSpDefense = 100,
.expYield = 236, .expYield = 236,
.abilities = {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_CHLOROPHYLL}, .abilities = {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_CHLOROPHYLL},
.height = 20, DEX_TEXT(Venusaur, "Seed"),
.weight = 1000, DEX_SCALE(256, 0, 388, 6),
.description = gVenusaurPokedexText, HEIGHT_WEIGHT(20, 1000),
.pokemonScale = 256, FRONT_SPRITE(Venusaur, 56, 48, 9, 0),
.pokemonOffset = 0, BACK_SPRITE (Venusaur, 64, 56, 9),
.trainerScale = 388, PALETTES(Venusaur),
.trainerOffset = 6, ICON(Venusaur, 4),
ANIMATIONS(VENUSAUR, 0, ANIM_ROTATE_UP_SLAM_DOWN, BACK_ANIM_H_SLIDE),
VENUSAUR_MISC_STATS, VENUSAUR_MISC_STATS,
}, },
[SPECIES_VENUSAUR_MEGA] = [SPECIES_VENUSAUR_MEGA] =
@ -181,13 +190,14 @@ const struct BaseStats gBaseStats[] =
.expYield = 281, .expYield = 281,
.abilities = {ABILITY_THICK_FAT, ABILITY_NONE, ABILITY_THICK_FAT}, .abilities = {ABILITY_THICK_FAT, ABILITY_NONE, ABILITY_THICK_FAT},
.flags = SPECIES_FLAG_MEGA_EVOLUTION, .flags = SPECIES_FLAG_MEGA_EVOLUTION,
.height = 24, DEX_TEXT(VenusaurMega, "Seed"),
.weight = 1555, DEX_SCALE(256, 0, 388, 6),
.description = gVenusaurMegaPokedexText, HEIGHT_WEIGHT(24, 1555),
.pokemonScale = 256, FRONT_SPRITE(VenusaurMega, 56, 48, 9, 0),
.pokemonOffset = 0, BACK_SPRITE (VenusaurMega, 64, 56, 9),
.trainerScale = 388, PALETTES(VenusaurMega),
.trainerOffset = 6, ICON(VenusaurMega, 4),
ANIMATIONS(VENUSAUR, 0, ANIM_V_STRETCH, BACK_ANIM_H_SLIDE),
VENUSAUR_MISC_STATS, VENUSAUR_MISC_STATS,
}, },
@ -213,14 +223,19 @@ const struct BaseStats gBaseStats[] =
.abilities = {ABILITY_BLAZE, ABILITY_NONE, ABILITY_SOLAR_POWER}, .abilities = {ABILITY_BLAZE, ABILITY_NONE, ABILITY_SOLAR_POWER},
.bodyColor = BODY_COLOR_RED, .bodyColor = BODY_COLOR_RED,
.noFlip = FALSE, .noFlip = FALSE,
.categoryName = _("Lizard"), .speciesName = _("Charmander"),
.height = 6, .natDexNum = NATIONAL_DEX_CHARMANDER,
.weight = 85, DEX_TEXT(Charmander, "Lizard"),
.description = gCharmanderPokedexText, DEX_SCALE(444, 18, 256, 0),
.pokemonScale = 444, HEIGHT_WEIGHT(6, 85),
.pokemonOffset = 18,
.trainerScale = 256, LEARNSETS(Ivysaur),
.trainerOffset = 0, FRONT_SPRITE(Ivysaur, 56, 48, 9, 0),
BACK_SPRITE (Ivysaur, 64, 56, 9),
PALETTES(Ivysaur),
ICON(Ivysaur, 4),
FOOTPRINT(Ivysaur),
ANIMATIONS(IVYSAUR, 0, ANIM_V_STRETCH, BACK_ANIM_H_SLIDE),
}, },
[SPECIES_CHARMELEON] = [SPECIES_CHARMELEON] =

4
src/data/pokemon/level_up_learnset_pointers.h
View file

@ -1,9 +1,5 @@
const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
{ {
[SPECIES_NONE] = sBulbasaurLevelUpLearnset,
[SPECIES_IVYSAUR] = sIvysaurLevelUpLearnset,
[SPECIES_VENUSAUR] = sVenusaurLevelUpLearnset,
[SPECIES_VENUSAUR_MEGA] = sVenusaurLevelUpLearnset,
[SPECIES_CHARMANDER] = sCharmanderLevelUpLearnset, [SPECIES_CHARMANDER] = sCharmanderLevelUpLearnset,
[SPECIES_CHARMELEON] = sCharmeleonLevelUpLearnset, [SPECIES_CHARMELEON] = sCharmeleonLevelUpLearnset,
[SPECIES_CHARIZARD] = sCharizardLevelUpLearnset, [SPECIES_CHARIZARD] = sCharizardLevelUpLearnset,

3
src/data/pokemon/teachable_learnset_pointers.h
View file

@ -1,8 +1,5 @@
const u16 *const gTeachableLearnsets[NUM_SPECIES] = const u16 *const gTeachableLearnsets[NUM_SPECIES] =
{ {
[SPECIES_IVYSAUR] = sIvysaurTeachableLearnset,
[SPECIES_VENUSAUR] = sVenusaurTeachableLearnset,
[SPECIES_VENUSAUR_MEGA] = sVenusaurTeachableLearnset,
[SPECIES_CHARMANDER] = sCharmanderTeachableLearnset, [SPECIES_CHARMANDER] = sCharmanderTeachableLearnset,
[SPECIES_CHARMELEON] = sCharmeleonTeachableLearnset, [SPECIES_CHARMELEON] = sCharmeleonTeachableLearnset,
[SPECIES_CHARIZARD] = sCharizardTeachableLearnset, [SPECIES_CHARIZARD] = sCharizardTeachableLearnset,

1298
src/data/pokemon_graphics/back_pic_coordinates.h
View file

File diff suppressed because it is too large Load diff

1286
src/data/pokemon_graphics/back_pic_table.h
View file

File diff suppressed because it is too large Load diff

270
src/data/pokemon_graphics/enemy_mon_elevation.h
View file

@ -1,270 +0,0 @@
// This determines how much higher above the usual position the enemy Pokémon
// is during battle. Species that float or fly have nonzero values.
const u8 gEnemyMonElevation[NUM_SPECIES] =
{
[SPECIES_BUTTERFREE] = 10,
[SPECIES_BEEDRILL] = 9,
[SPECIES_BEEDRILL_MEGA] = 5,
[SPECIES_PIDGEOT] = 5,
[SPECIES_PIDGEOT_MEGA] = 8,
[SPECIES_FEAROW] = 6,
[SPECIES_RAICHU_ALOLAN] = 4,
[SPECIES_ZUBAT] = 16,
[SPECIES_GOLBAT] = 10,
[SPECIES_VENOMOTH] = 16,
[SPECIES_ALAKAZAM_MEGA] = 7,
[SPECIES_GEODUDE] = 16,
[SPECIES_GEODUDE_ALOLAN] = 16,
[SPECIES_MAGNEMITE] = 17,
[SPECIES_MAGNETON] = 9,
[SPECIES_GASTLY] = 10,
[SPECIES_HAUNTER] = 11,
[SPECIES_KOFFING] = 14,
[SPECIES_WEEZING] = 6,
[SPECIES_PINSIR] = 4,
[SPECIES_GYARADOS_MEGA] = 6,
[SPECIES_AERODACTYL] = 9,
[SPECIES_AERODACTYL_MEGA] = 7,
[SPECIES_ZAPDOS] = 8,
[SPECIES_MEWTWO_MEGA_Y] = 3,
[SPECIES_MEW] = 11,
[SPECIES_LEDIAN] = 10,
[SPECIES_CROBAT] = 9,
[SPECIES_HOPPIP] = 15,
[SPECIES_SKIPLOOM] = 15,
[SPECIES_JUMPLUFF] = 9,
[SPECIES_YANMA] = 13,
[SPECIES_MURKROW] = 12,
[SPECIES_MISDREAVUS] = 12,
[SPECIES_UNOWN] = 8,
[SPECIES_UNOWN_B] = 8,
[SPECIES_UNOWN_C] = 8,
[SPECIES_UNOWN_D] = 8,
[SPECIES_UNOWN_E] = 8,
[SPECIES_UNOWN_F] = 8,
[SPECIES_UNOWN_G] = 8,
[SPECIES_UNOWN_H] = 8,
[SPECIES_UNOWN_I] = 8,
[SPECIES_UNOWN_J] = 8,
[SPECIES_UNOWN_K] = 8,
[SPECIES_UNOWN_L] = 8,
[SPECIES_UNOWN_M] = 8,
[SPECIES_UNOWN_N] = 8,
[SPECIES_UNOWN_O] = 8,
[SPECIES_UNOWN_P] = 8,
[SPECIES_UNOWN_Q] = 8,
[SPECIES_UNOWN_R] = 8,
[SPECIES_UNOWN_S] = 8,
[SPECIES_UNOWN_T] = 8,
[SPECIES_UNOWN_U] = 8,
[SPECIES_UNOWN_V] = 8,
[SPECIES_UNOWN_W] = 8,
[SPECIES_UNOWN_X] = 8,
[SPECIES_UNOWN_Y] = 8,
[SPECIES_UNOWN_Z] = 8,
[SPECIES_UNOWN_QMARK] = 8,
[SPECIES_UNOWN_EMARK] = 8,
[SPECIES_GLIGAR] = 8,
[SPECIES_MANTINE] = 6,
[SPECIES_PORYGON2] = 9,
[SPECIES_LUGIA] = 6,
[SPECIES_HO_OH] = 6,
[SPECIES_CELEBI] = 15,
[SPECIES_BEAUTIFLY] = 10,
[SPECIES_DUSTOX] = 12,
[SPECIES_NINJASK] = 10,
[SPECIES_SHEDINJA] = 8,
[SPECIES_WINGULL] = 15,
[SPECIES_PELIPPER] = 8,
[SPECIES_MASQUERAIN] = 10,
[SPECIES_SHARPEDO_MEGA] = 1,
[SPECIES_ALTARIA_MEGA] = 6,
[SPECIES_FLYGON] = 7,
[SPECIES_BALTOY] = 5,
[SPECIES_CLAYDOL] = 10,
[SPECIES_GLALIE] = 12,
[SPECIES_LUNATONE] = 13,
[SPECIES_SOLROCK] = 4,
[SPECIES_ALTARIA] = 8,
[SPECIES_DUSKULL] = 13,
[SPECIES_SHUPPET] = 14,
[SPECIES_BANETTE] = 8,
[SPECIES_CASTFORM_NORMAL] = 16,
[SPECIES_CASTFORM_SUNNY] = 5,
[SPECIES_CASTFORM_RAINY] = 5,
[SPECIES_CASTFORM_SNOWY] = 5,
[SPECIES_BELDUM] = 8,
[SPECIES_RAYQUAZA] = 6,
[SPECIES_LATIAS] = 12,
[SPECIES_LATIOS] = 6,
[SPECIES_JIRACHI] = 14,
[SPECIES_CHIMECHO] = 16,
[SPECIES_BANETTE_MEGA] = 5,
[SPECIES_GLALIE_MEGA] = 8,
[SPECIES_METAGROSS_MEGA] = 4,
[SPECIES_LATIAS_MEGA] = 8,
[SPECIES_LATIOS_MEGA] = 8,
[SPECIES_RAYQUAZA_MEGA] = 4,
// Gen 4
[SPECIES_MOTHIM] = 10,
[SPECIES_COMBEE] = 8,
[SPECIES_VESPIQUEN] = 4,
[SPECIES_DRIFLOON] = 5,
[SPECIES_DRIFBLIM] = 7,
[SPECIES_MISMAGIUS] = 3,
[SPECIES_CHINGLING] = 5,
[SPECIES_BRONZONG] = 4,
[SPECIES_MAGNEZONE] = 4,
[SPECIES_TOGEKISS] = 14,
[SPECIES_YANMEGA] = 6,
[SPECIES_GLISCOR] = 9,
[SPECIES_PORYGON_Z] = 12,
[SPECIES_PROBOPASS] = 6,
[SPECIES_ROTOM] = 10,
[SPECIES_UXIE] = 6,
[SPECIES_MESPRIT] = 6,
[SPECIES_AZELF] = 6,
[SPECIES_CRESSELIA] = 3,
[SPECIES_DARKRAI] = 4,
// Platinum
[SPECIES_ROTOM_HEAT] = 6,
[SPECIES_ROTOM_WASH] = 6,
[SPECIES_ROTOM_FROST] = 6,
[SPECIES_ROTOM_FAN] = 6,
[SPECIES_ROTOM_MOW] = 6,
[SPECIES_GIRATINA_ORIGIN] = 7,
// Black and White
[SPECIES_MUNNA] = 7,
[SPECIES_MUSHARNA] = 5,
[SPECIES_WOOBAT] = 19,
[SPECIES_SWOOBAT] = 12,
[SPECIES_PETILIL] = 7,
[SPECIES_SIGILYPH] = 7,
[SPECIES_YAMASK] = 10,
[SPECIES_ARCHEOPS] = 8,
[SPECIES_SOLOSIS] = 14,
[SPECIES_DUOSION] = 7,
[SPECIES_REUNICLUS] = 8,
[SPECIES_EMOLGA] = 19,
[SPECIES_TYNAMO] = 16,
[SPECIES_EELEKTRIK] = 8,
[SPECIES_EELEKTROSS] = 8,
[SPECIES_CRYOGONAL] = 3,
[SPECIES_BRAVIARY] = 8,
[SPECIES_HYDREIGON] = 3,
[SPECIES_VOLCARONA] = 6,
[SPECIES_TORNADUS_INCARNATE] = 7,
[SPECIES_THUNDURUS_INCARNATE] = 7,
[SPECIES_THUNDURUS_THERIAN] = 7,
[SPECIES_LANDORUS_INCARNATE] = 7,
[SPECIES_MELOETTA_ARIA] = 8,
[SPECIES_MELOETTA_PIROUETTE] = 5,
// Gen 6
[SPECIES_FLETCHINDER] = 9,
[SPECIES_TALONFLAME] = 7,
[SPECIES_VIVILLON_ICY_SNOW] = 9,
[SPECIES_VIVILLON_POLAR] = 9,
[SPECIES_VIVILLON_TUNDRA] = 9,
[SPECIES_VIVILLON_CONTINENTAL] = 9,
[SPECIES_VIVILLON_GARDEN] = 9,
[SPECIES_VIVILLON_ELEGANT] = 9,
[SPECIES_VIVILLON_MEADOW] = 9,
[SPECIES_VIVILLON_MODERN] = 9,
[SPECIES_VIVILLON_MARINE] = 9,
[SPECIES_VIVILLON_ARCHIPELAGO] = 9,
[SPECIES_VIVILLON_HIGH_PLAINS] = 9,
[SPECIES_VIVILLON_SANDSTORM] = 9,
[SPECIES_VIVILLON_RIVER] = 9,
[SPECIES_VIVILLON_MONSOON] = 9,
[SPECIES_VIVILLON_SAVANNA] = 9,
[SPECIES_VIVILLON_SUN] = 9,
[SPECIES_VIVILLON_OCEAN] = 9,
[SPECIES_VIVILLON_JUNGLE] = 9,
[SPECIES_VIVILLON_FANCY] = 9,
[SPECIES_VIVILLON_POKE_BALL] = 9,
[SPECIES_FLABEBE_RED_FLOWER] = 6,
[SPECIES_FLABEBE_YELLOW_FLOWER] = 6,
[SPECIES_FLABEBE_ORANGE_FLOWER] = 6,
[SPECIES_FLABEBE_BLUE_FLOWER] = 6,
[SPECIES_FLABEBE_WHITE_FLOWER] = 6,
[SPECIES_FLOETTE_RED_FLOWER] = 4,
[SPECIES_FLOETTE_YELLOW_FLOWER] = 4,
[SPECIES_FLOETTE_ORANGE_FLOWER] = 4,
[SPECIES_FLOETTE_BLUE_FLOWER] = 4,
[SPECIES_FLOETTE_WHITE_FLOWER] = 4,
[SPECIES_FLOETTE_ETERNAL_FLOWER] = 4,
[SPECIES_HONEDGE] = 4,
[SPECIES_DOUBLADE] = 5,
[SPECIES_AEGISLASH_SHIELD] = 3,
[SPECIES_AEGISLASH_BLADE] = 3,
[SPECIES_SPRITZEE] = 14,
[SPECIES_INKAY] = 14,
[SPECIES_CARBINK] = 4,
[SPECIES_KLEFKI] = 5,
[SPECIES_PHANTUMP] = 5,
[SPECIES_NOIBAT] = 8,
[SPECIES_YVELTAL] = 5,
[SPECIES_HOOPA_CONFINED] = 13,
[SPECIES_HOOPA_UNBOUND] = 3,
// Gen 7
[SPECIES_VIKAVOLT] = 8,
[SPECIES_CUTIEFLY] = 10,
[SPECIES_RIBOMBEE] = 6,
[SPECIES_COMFEY] = 8,
[SPECIES_MINIOR_METEOR_RED] = 17,
[SPECIES_MINIOR_METEOR_ORANGE] = 17,
[SPECIES_MINIOR_METEOR_YELLOW] = 17,
[SPECIES_MINIOR_METEOR_GREEN] = 17,
[SPECIES_MINIOR_METEOR_BLUE] = 17,
[SPECIES_MINIOR_METEOR_INDIGO] = 17,
[SPECIES_MINIOR_METEOR_VIOLET] = 17,
[SPECIES_MINIOR_CORE_RED] = 17,
[SPECIES_MINIOR_CORE_ORANGE] = 17,
[SPECIES_MINIOR_CORE_YELLOW] = 17,
[SPECIES_MINIOR_CORE_GREEN] = 17,
[SPECIES_MINIOR_CORE_BLUE] = 17,
[SPECIES_MINIOR_CORE_INDIGO] = 17,
[SPECIES_MINIOR_CORE_VIOLET] = 17,
[SPECIES_DHELMISE] = 2,
[SPECIES_TAPU_KOKO] = 9,
[SPECIES_TAPU_LELE] = 8,
[SPECIES_TAPU_BULU] = 5,
[SPECIES_TAPU_FINI] = 6,
[SPECIES_COSMOG] = 7,
[SPECIES_COSMOEM] = 3,
[SPECIES_LUNALA] = 6,
[SPECIES_NIHILEGO] = 6,
[SPECIES_KARTANA] = 3,
[SPECIES_NECROZMA] = 6,
[SPECIES_NECROZMA_DAWN_WINGS] = 6,
[SPECIES_NECROZMA_ULTRA] = 5,
[SPECIES_POIPOLE] = 9,
[SPECIES_NAGANADEL] = 7,
// Gen 8
[SPECIES_CORVISQUIRE] = 10,
[SPECIES_ORBEETLE] = 8,
[SPECIES_FLAPPLE] = 9,
[SPECIES_SINISTEA_PHONY] = 9,
[SPECIES_SINISTEA_ANTIQUE] = 10, // Slightly higher to distinguish from Phony
[SPECIES_POLTEAGEIST_PHONY] = 11,
[SPECIES_POLTEAGEIST_ANTIQUE] = 12, // Slightly higher to distinguish from Phony
[SPECIES_RUNERIGUS] = 5,
[SPECIES_MILCERY] = 10,
[SPECIES_FROSMOTH] = 7,
[SPECIES_DREEPY] = 5,
[SPECIES_DRAKLOAK] = 5,
[SPECIES_DRAGAPULT] = 3,
[SPECIES_ETERNATUS] = 4,
[SPECIES_REGIELEKI] = 8,
[SPECIES_REGIDRAGO] = 5,
// Galarian Forms
[SPECIES_WEEZING_GALARIAN] = 6,
[SPECIES_ARTICUNO_GALARIAN] = 10,
[SPECIES_YAMASK_GALARIAN] = 4,
// Hisuian Forms
[SPECIES_VOLTORB_HISUIAN] = 1,
[SPECIES_ELECTRODE_HISUIAN] = 4,
[SPECIES_BRAVIARY_HISUIAN] = 3,
// Other Forms
[SPECIES_ETERNATUS_ETERNAMAX] = 13,
};

1286
src/data/pokemon_graphics/footprint_table.h
View file

File diff suppressed because it is too large Load diff

1314
src/data/pokemon_graphics/front_pic_anims.h
View file

File diff suppressed because it is too large Load diff

1288
src/data/pokemon_graphics/front_pic_coordinates.h
View file

File diff suppressed because it is too large Load diff

1282
src/data/pokemon_graphics/front_pic_table.h
View file

File diff suppressed because it is too large Load diff

1288
src/data/pokemon_graphics/palette_table.h
View file

File diff suppressed because it is too large Load diff

1
src/data/pokemon_graphics/shiny_palette_table.h
View file

@ -1,6 +1,5 @@
const struct CompressedSpritePalette gMonShinyPaletteTable[] = const struct CompressedSpritePalette gMonShinyPaletteTable[] =
{ {
SPECIES_SHINY_PAL(IVYSAUR, gMonShinyPalette_Ivysaur),
SPECIES_SHINY_PAL(VENUSAUR, gMonShinyPalette_Venusaur), SPECIES_SHINY_PAL(VENUSAUR, gMonShinyPalette_Venusaur),
SPECIES_SHINY_PAL(VENUSAUR_MEGA, gMonShinyPalette_VenusaurMega), SPECIES_SHINY_PAL(VENUSAUR_MEGA, gMonShinyPalette_VenusaurMega),
SPECIES_SHINY_PAL(CHARMANDER, gMonShinyPalette_Charmander), SPECIES_SHINY_PAL(CHARMANDER, gMonShinyPalette_Charmander),

5
src/data/text/species_names.h
View file

@ -1,9 +1,4 @@
const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_NONE] = _("??????????"),
[SPECIES_IVYSAUR] = _("Ivysaur"),
[SPECIES_VENUSAUR] = _("Venusaur"),
[SPECIES_VENUSAUR_MEGA] = _("Venusaur"),
[SPECIES_CHARMANDER] = _("Charmander"), [SPECIES_CHARMANDER] = _("Charmander"),
[SPECIES_CHARMELEON] = _("Charmeleon"), [SPECIES_CHARMELEON] = _("Charmeleon"),
[SPECIES_CHARIZARD] = _("Charizard"), [SPECIES_CHARIZARD] = _("Charizard"),

2
src/pokedex.c
View file

@ -1014,8 +1014,6 @@ static const struct WindowTemplate sNewEntryInfoScreen_WindowTemplates[] =
static const u8 sText_TenDashes2[] = _("----------"); static const u8 sText_TenDashes2[] = _("----------");
#include "data/pokemon_graphics/footprint_table.h"
// First character in range followed by number of characters in range for upper and lowercase // First character in range followed by number of characters in range for upper and lowercase
static const u8 sLetterSearchRanges[][4] = static const u8 sLetterSearchRanges[][4] =
{ {

1356
src/pokemon.c
View file

File diff suppressed because it is too large Load diff

2
src/pokemon_animation.c
View file

@ -214,8 +214,6 @@ static bool32 sIsSummaryAnim;
static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] =
{ {
[SPECIES_IVYSAUR] = BACK_ANIM_H_SLIDE,
[SPECIES_VENUSAUR] = BACK_ANIM_H_SHAKE,
[SPECIES_CHARMANDER] = BACK_ANIM_CONCAVE_ARC_SMALL, [SPECIES_CHARMANDER] = BACK_ANIM_CONCAVE_ARC_SMALL,
[SPECIES_CHARMELEON] = BACK_ANIM_JOLT_RIGHT, [SPECIES_CHARMELEON] = BACK_ANIM_JOLT_RIGHT,
[SPECIES_CHARIZARD] = BACK_ANIM_SHAKE_GLOW_RED, [SPECIES_CHARIZARD] = BACK_ANIM_SHAKE_GLOW_RED,

4
src/pokemon_debug.c
View file

@ -765,7 +765,7 @@ static u8 GetElevationValue(u16 species)
else if (IsCastformForm(species)) else if (IsCastformForm(species))
val = sCastformElevations[species - SPECIES_CASTFORM_SUNNY + 1]; val = sCastformElevations[species - SPECIES_CASTFORM_SUNNY + 1];
else else
val = gEnemyMonElevation[species]; val = gBaseStats[species].enemyMonElevation;
return val; return val;
} }
@ -826,7 +826,7 @@ static void LoadAndCreateEnemyShadowSpriteCustom(struct PokemonDebugMenu *data,
{ {
u8 x, y; u8 x, y;
bool8 invisible = FALSE; bool8 invisible = FALSE;
if (gEnemyMonElevation[species] == 0 && !IsCastformForm(species)) if (gBaseStats[species].enemyMonElevation == 0 && !IsCastformForm(species))
invisible = TRUE; invisible = TRUE;
LoadCompressedSpriteSheet(&gSpriteSheet_EnemyShadow); LoadCompressedSpriteSheet(&gSpriteSheet_EnemyShadow);
LoadSpritePalette(&sSpritePalettes_HealthBoxHealthBar[0]); LoadSpritePalette(&sSpritePalettes_HealthBoxHealthBar[0]);

2544
src/pokemon_icon.c
View file

File diff suppressed because it is too large Load diff