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

include/graphics.h

Browse source
This commit is contained in:
Eduardo Quezada 2022-09-27 21:09:09 -03:00
parent 4c7b6d1662
commit 5b4a23b672
6 changed files with 851 additions and 970 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1788
include/graphics.h
View file

File diff suppressed because it is too large Load diff

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

@ -519,7 +519,6 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_DEOXYS_DEFENSE] = sDeoxysDefenseLevelUpLearnset,
[SPECIES_DEOXYS_SPEED] = sDeoxysSpeedLevelUpLearnset,
#if P_GEN_4_POKEMON == TRUE
// Diamond and Pearl
[SPECIES_TURTWIG] = sTurtwigLevelUpLearnset,
[SPECIES_GROTLE] = sGrotleLevelUpLearnset,
[SPECIES_TORTERRA] = sTorterraLevelUpLearnset,

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

@ -388,7 +388,6 @@ const u8 *const gMonFootprintTable[] =
[SPECIES_DEOXYS] = gMonFootprint_Deoxys,
[SPECIES_CHIMECHO] = gMonFootprint_Chimecho,
#if P_GEN_4_POKEMON == TRUE
// Diamond and Pearl
[SPECIES_TURTWIG] = gMonFootprint_Turtwig,
[SPECIES_GROTLE] = gMonFootprint_Grotle,
[SPECIES_TORTERRA] = gMonFootprint_Torterra,

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

@ -773,7 +773,7 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_VANILLITE] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 },
[SPECIES_VANILLISH] = { .size = MON_COORDS_SIZE(32, 56), .y_offset = 5 },
[SPECIES_VANILLUXE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 },
[SPECIES_DEERLING_SPRING] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 },
[SPECIES_DEERLING_SPRING] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 },
[SPECIES_DEERLING_SUMMER] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 },
[SPECIES_DEERLING_AUTUMN] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 },
[SPECIES_DEERLING_WINTER] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 },
@ -1091,7 +1091,7 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_PALOSSAND] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_PYUKUMUKU] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 15 },
[SPECIES_TYPE_NULL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 },
[SPECIES_SILVALLY_NORMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SILVALLY_NORMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SILVALLY_FIGHTING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SILVALLY_FLYING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SILVALLY_POISON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
@ -1109,7 +1109,7 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_SILVALLY_DRAGON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SILVALLY_DARK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SILVALLY_FAIRY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_MINIOR_METEOR_RED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 },
[SPECIES_MINIOR_METEOR_RED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 },
[SPECIES_MINIOR_METEOR_ORANGE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 },
[SPECIES_MINIOR_METEOR_YELLOW] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 },
[SPECIES_MINIOR_METEOR_GREEN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 },
@ -1126,7 +1126,7 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_KOMALA] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 },
[SPECIES_TURTONATOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_TOGEDEMARU] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 },
[SPECIES_MIMIKYU_DISGUISED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 },
[SPECIES_MIMIKYU_DISGUISED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 },
[SPECIES_MIMIKYU_BUSTED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 },
[SPECIES_BRUXISH] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 },
[SPECIES_DRAMPA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },

4
src/pokemon.c
View file

@ -2913,12 +2913,8 @@ static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] =
[SPECIES_SALAMENCE - 1] = 70,
[SPECIES_KYOGRE - 1] = 60,
[SPECIES_RAYQUAZA - 1] = 60,
#if P_GEN_4_POKEMON == TRUE
[SPECIES_ROTOM_FAN - 1] = 7,
#endif
#if P_GEN_7_POKEMON == TRUE
[SPECIES_TAPU_FINI - 1] = 5,
#endif
};
#define PP_UP_SHIFTS(val) val, (val) << 2, (val) << 4, (val) << 6

19
src/pokemon_icon.c
View file

@ -545,7 +545,6 @@ const u8 *const gMonIconTable[] =
[SPECIES_DEOXYS_DEFENSE] = gMonIcon_DeoxysDefense,
[SPECIES_DEOXYS_SPEED] = gMonIcon_DeoxysSpeed,
#if P_GEN_4_POKEMON == TRUE
// Diamond and Pearl
[SPECIES_TURTWIG] = gMonIcon_Turtwig,
[SPECIES_GROTLE] = gMonIcon_Grotle,
[SPECIES_TORTERRA] = gMonIcon_Torterra,
@ -693,7 +692,6 @@ const u8 *const gMonIconTable[] =
[SPECIES_ARCEUS_FAIRY] = gMonIcon_Arceus,
#endif
#if P_GEN_5_POKEMON == TRUE
// Black and White
[SPECIES_VICTINI] = gMonIcon_Victini,
[SPECIES_SNIVY] = gMonIcon_Snivy,
[SPECIES_SERVINE] = gMonIcon_Servine,
@ -1347,22 +1345,22 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_IVYSAUR] = 4,
[SPECIES_VENUSAUR] = 4,
[SPECIES_VENUSAUR_MEGA] = 1,
[SPECIES_VENUSAUR_GIGANTAMAX] = 1, //Todo
//[SPECIES_VENUSAUR_GIGANTAMAX] = 0,
[SPECIES_CHARMANDER] = 0,
[SPECIES_CHARMELEON] = 0,
[SPECIES_CHARIZARD] = 0,
[SPECIES_CHARIZARD_MEGA_X] = 0,
[SPECIES_CHARIZARD_MEGA_Y] = 0,
[SPECIES_CHARIZARD_GIGANTAMAX] = 0, //Todo
//[SPECIES_CHARIZARD_GIGANTAMAX] = 0,
[SPECIES_SQUIRTLE] = 0,
[SPECIES_WARTORTLE] = 2,
[SPECIES_BLASTOISE] = 2,
[SPECIES_BLASTOISE_MEGA] = 2,
[SPECIES_BLASTOISE_GIGANTAMAX] = 2, //Todo
//[SPECIES_BLASTOISE_GIGANTAMAX] = 0,
[SPECIES_CATERPIE] = 1,
[SPECIES_METAPOD] = 1,
[SPECIES_BUTTERFREE] = 0,
[SPECIES_BUTTERFREE_GIGANTAMAX] = 0, //Todo
//[SPECIES_BUTTERFREE_GIGANTAMAX] = 0,
[SPECIES_WEEDLE] = 2,
[SPECIES_KAKUNA] = 2,
[SPECIES_BEEDRILL] = 2,
@ -2475,6 +2473,7 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_ZERAORA] = 0,
[SPECIES_MELTAN] = 2,
[SPECIES_MELMETAL] = 2,
// Gen 8
[SPECIES_GROOKEY] = 1,
[SPECIES_THWACKEY] = 1,
[SPECIES_RILLABOOM] = 1,
@ -2601,7 +2600,6 @@ const u8 gMonIconPaletteIndices[] =
const u8 gMonIconPaletteIndicesFemale[] =
{
[SPECIES_EEVEE] = 2,
#if P_GEN_4_POKEMON == TRUE
[SPECIES_STARLY] = 0,
[SPECIES_STARAVIA] = 0,
[SPECIES_BIDOOF] = 2,
@ -2611,18 +2609,11 @@ const u8 gMonIconPaletteIndicesFemale[] =
[SPECIES_COMBEE] = 0,
[SPECIES_HIPPOPOTAS] = 1,
[SPECIES_HIPPOWDON] = 1,
#endif
#if P_GEN_5_POKEMON == TRUE
[SPECIES_UNFEZANT] = 1,
[SPECIES_FRILLISH] = 1,
[SPECIES_JELLICENT] = 1,
#endif
#if P_GEN_6_POKEMON == TRUE
[SPECIES_PYROAR] = 2,
#endif
#if P_GEN_8_POKEMON == TRUE
[SPECIES_BASCULEGION] = 0,
#endif
};
const struct SpritePalette gMonIconPaletteTable[] =