More reordering
This commit is contained in:
parent
c104845f77
commit
1ea9681534
2 changed files with 20 additions and 23 deletions
|
@ -628,6 +628,11 @@ const struct MonCoords gMonFrontPicCoords[] =
|
||||||
[SPECIES_DUSKNOIR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 },
|
[SPECIES_DUSKNOIR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 },
|
||||||
[SPECIES_FROSLASS] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 },
|
[SPECIES_FROSLASS] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 },
|
||||||
[SPECIES_ROTOM] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 },
|
[SPECIES_ROTOM] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 },
|
||||||
|
[SPECIES_ROTOM_HEAT] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 },
|
||||||
|
[SPECIES_ROTOM_WASH] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 },
|
||||||
|
[SPECIES_ROTOM_FROST] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 },
|
||||||
|
[SPECIES_ROTOM_FAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 },
|
||||||
|
[SPECIES_ROTOM_MOW] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 12 },
|
||||||
[SPECIES_UXIE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 },
|
[SPECIES_UXIE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 },
|
||||||
[SPECIES_MESPRIT] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 4 },
|
[SPECIES_MESPRIT] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 4 },
|
||||||
[SPECIES_AZELF] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 },
|
[SPECIES_AZELF] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 },
|
||||||
|
@ -638,11 +643,13 @@ const struct MonCoords gMonFrontPicCoords[] =
|
||||||
[SPECIES_HEATRAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 },
|
[SPECIES_HEATRAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 },
|
||||||
[SPECIES_REGIGIGAS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 },
|
[SPECIES_REGIGIGAS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 },
|
||||||
[SPECIES_GIRATINA_ALTERED] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
[SPECIES_GIRATINA_ALTERED] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
||||||
|
[SPECIES_GIRATINA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
||||||
[SPECIES_CRESSELIA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 },
|
[SPECIES_CRESSELIA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 },
|
||||||
[SPECIES_PHIONE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 8 },
|
[SPECIES_PHIONE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 8 },
|
||||||
[SPECIES_MANAPHY] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 10 },
|
[SPECIES_MANAPHY] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 10 },
|
||||||
[SPECIES_DARKRAI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 },
|
[SPECIES_DARKRAI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 },
|
||||||
[SPECIES_SHAYMIN_LAND] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 16 },
|
[SPECIES_SHAYMIN_LAND] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 16 },
|
||||||
|
[SPECIES_SHAYMIN_SKY] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 },
|
||||||
[SPECIES_ARCEUS_NORMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
[SPECIES_ARCEUS_NORMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
||||||
[SPECIES_ARCEUS_FIGHTING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
[SPECIES_ARCEUS_FIGHTING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
||||||
[SPECIES_ARCEUS_FLYING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
[SPECIES_ARCEUS_FLYING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
||||||
|
@ -661,13 +668,6 @@ const struct MonCoords gMonFrontPicCoords[] =
|
||||||
[SPECIES_ARCEUS_DRAGON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
[SPECIES_ARCEUS_DRAGON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
||||||
[SPECIES_ARCEUS_DARK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
[SPECIES_ARCEUS_DARK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
||||||
[SPECIES_ARCEUS_FAIRY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
[SPECIES_ARCEUS_FAIRY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
||||||
[SPECIES_ROTOM_HEAT] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 },
|
|
||||||
[SPECIES_ROTOM_WASH] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 },
|
|
||||||
[SPECIES_ROTOM_FROST] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 },
|
|
||||||
[SPECIES_ROTOM_FAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 },
|
|
||||||
[SPECIES_ROTOM_MOW] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 12 },
|
|
||||||
[SPECIES_GIRATINA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
|
||||||
[SPECIES_SHAYMIN_SKY] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 },
|
|
||||||
#endif
|
#endif
|
||||||
#if P_GEN_5_POKEMON == TRUE
|
#if P_GEN_5_POKEMON == TRUE
|
||||||
[SPECIES_VICTINI] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 10 },
|
[SPECIES_VICTINI] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 10 },
|
||||||
|
@ -838,12 +838,18 @@ const struct MonCoords gMonFrontPicCoords[] =
|
||||||
[SPECIES_TERRAKION] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 },
|
[SPECIES_TERRAKION] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 },
|
||||||
[SPECIES_VIRIZION] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 },
|
[SPECIES_VIRIZION] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 },
|
||||||
[SPECIES_TORNADUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 },
|
[SPECIES_TORNADUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 },
|
||||||
|
[SPECIES_TORNADUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
||||||
[SPECIES_THUNDURUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 },
|
[SPECIES_THUNDURUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 },
|
||||||
|
[SPECIES_THUNDURUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 },
|
||||||
[SPECIES_RESHIRAM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 },
|
[SPECIES_RESHIRAM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 },
|
||||||
[SPECIES_ZEKROM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
[SPECIES_ZEKROM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
||||||
[SPECIES_LANDORUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 },
|
[SPECIES_LANDORUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 },
|
||||||
|
[SPECIES_LANDORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
||||||
[SPECIES_KYUREM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 },
|
[SPECIES_KYUREM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 },
|
||||||
|
[SPECIES_KYUREM_WHITE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
||||||
|
[SPECIES_KYUREM_BLACK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
||||||
[SPECIES_KELDEO_ORDINARY] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 },
|
[SPECIES_KELDEO_ORDINARY] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 },
|
||||||
|
[SPECIES_KELDEO_RESOLUTE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 },
|
||||||
[SPECIES_MELOETTA_ARIA] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 9 },
|
[SPECIES_MELOETTA_ARIA] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 9 },
|
||||||
[SPECIES_MELOETTA_PIROUETTE] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 2 },
|
[SPECIES_MELOETTA_PIROUETTE] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 2 },
|
||||||
[SPECIES_GENESECT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 },
|
[SPECIES_GENESECT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 },
|
||||||
|
@ -851,12 +857,6 @@ const struct MonCoords gMonFrontPicCoords[] =
|
||||||
[SPECIES_GENESECT_SHOCK_DRIVE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 },
|
[SPECIES_GENESECT_SHOCK_DRIVE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 },
|
||||||
[SPECIES_GENESECT_BURN_DRIVE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 },
|
[SPECIES_GENESECT_BURN_DRIVE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 },
|
||||||
[SPECIES_GENESECT_CHILL_DRIVE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 },
|
[SPECIES_GENESECT_CHILL_DRIVE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 },
|
||||||
[SPECIES_TORNADUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
|
||||||
[SPECIES_THUNDURUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 },
|
|
||||||
[SPECIES_LANDORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
|
||||||
[SPECIES_KYUREM_WHITE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
|
||||||
[SPECIES_KYUREM_BLACK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
|
|
||||||
[SPECIES_KELDEO_RESOLUTE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 },
|
|
||||||
#endif
|
#endif
|
||||||
#if P_GEN_6_POKEMON == TRUE
|
#if P_GEN_6_POKEMON == TRUE
|
||||||
[SPECIES_CHESPIN] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 10 },
|
[SPECIES_CHESPIN] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 10 },
|
||||||
|
|
|
@ -833,12 +833,18 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
|
||||||
[SPECIES_TERRAKION] = _("Terrakion"),
|
[SPECIES_TERRAKION] = _("Terrakion"),
|
||||||
[SPECIES_VIRIZION] = _("Virizion"),
|
[SPECIES_VIRIZION] = _("Virizion"),
|
||||||
[SPECIES_TORNADUS_INCARNATE] = _("Tornadus"),
|
[SPECIES_TORNADUS_INCARNATE] = _("Tornadus"),
|
||||||
|
[SPECIES_TORNADUS_THERIAN] = _("Tornadus"),
|
||||||
[SPECIES_THUNDURUS_INCARNATE] = _("Thundurus"),
|
[SPECIES_THUNDURUS_INCARNATE] = _("Thundurus"),
|
||||||
|
[SPECIES_THUNDURUS_THERIAN] = _("Thundurus"),
|
||||||
[SPECIES_RESHIRAM] = _("Reshiram"),
|
[SPECIES_RESHIRAM] = _("Reshiram"),
|
||||||
[SPECIES_ZEKROM] = _("Zekrom"),
|
[SPECIES_ZEKROM] = _("Zekrom"),
|
||||||
[SPECIES_LANDORUS_INCARNATE] = _("Landorus"),
|
[SPECIES_LANDORUS_INCARNATE] = _("Landorus"),
|
||||||
|
[SPECIES_LANDORUS_THERIAN] = _("Landorus"),
|
||||||
[SPECIES_KYUREM] = _("Kyurem"),
|
[SPECIES_KYUREM] = _("Kyurem"),
|
||||||
|
[SPECIES_KYUREM_BLACK] = _("Kyurem"),
|
||||||
|
[SPECIES_KYUREM_WHITE] = _("Kyurem"),
|
||||||
[SPECIES_KELDEO_ORDINARY] = _("Keldeo"),
|
[SPECIES_KELDEO_ORDINARY] = _("Keldeo"),
|
||||||
|
[SPECIES_KELDEO_RESOLUTE] = _("Keldeo"),
|
||||||
[SPECIES_MELOETTA_ARIA] = _("Meloetta"),
|
[SPECIES_MELOETTA_ARIA] = _("Meloetta"),
|
||||||
[SPECIES_MELOETTA_PIROUETTE] = _("Meloetta"),
|
[SPECIES_MELOETTA_PIROUETTE] = _("Meloetta"),
|
||||||
[SPECIES_GENESECT] = _("Genesect"),
|
[SPECIES_GENESECT] = _("Genesect"),
|
||||||
|
@ -846,18 +852,8 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
|
||||||
[SPECIES_GENESECT_SHOCK_DRIVE] = _("Genesect"),
|
[SPECIES_GENESECT_SHOCK_DRIVE] = _("Genesect"),
|
||||||
[SPECIES_GENESECT_BURN_DRIVE] = _("Genesect"),
|
[SPECIES_GENESECT_BURN_DRIVE] = _("Genesect"),
|
||||||
[SPECIES_GENESECT_CHILL_DRIVE] = _("Genesect"),
|
[SPECIES_GENESECT_CHILL_DRIVE] = _("Genesect"),
|
||||||
// Black 2 and White 2
|
|
||||||
[SPECIES_TORNADUS_THERIAN] = _("Tornadus"),
|
|
||||||
[SPECIES_THUNDURUS_THERIAN] = _("Thundurus"),
|
|
||||||
[SPECIES_LANDORUS_THERIAN] = _("Landorus"),
|
|
||||||
[SPECIES_ENAMORUS_THERIAN] = _("Enamorus"),
|
|
||||||
[SPECIES_KYUREM_BLACK] = _("Kyurem"),
|
|
||||||
[SPECIES_KYUREM_WHITE] = _("Kyurem"),
|
|
||||||
[SPECIES_KELDEO_RESOLUTE] = _("Keldeo"),
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if P_GEN_6_POKEMON == TRUE
|
#if P_GEN_6_POKEMON == TRUE
|
||||||
// X and Y
|
|
||||||
[SPECIES_CHESPIN] = _("Chespin"),
|
[SPECIES_CHESPIN] = _("Chespin"),
|
||||||
[SPECIES_QUILLADIN] = _("Quilladin"),
|
[SPECIES_QUILLADIN] = _("Quilladin"),
|
||||||
[SPECIES_CHESNAUGHT] = _("Chesnaught"),
|
[SPECIES_CHESNAUGHT] = _("Chesnaught"),
|
||||||
|
@ -1283,5 +1279,6 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
|
||||||
[SPECIES_SNEASLER] = _("Sneasler"),
|
[SPECIES_SNEASLER] = _("Sneasler"),
|
||||||
[SPECIES_OVERQWIL] = _("Overqwil"),
|
[SPECIES_OVERQWIL] = _("Overqwil"),
|
||||||
[SPECIES_ENAMORUS_INCARNATE] = _("Enamorus"),
|
[SPECIES_ENAMORUS_INCARNATE] = _("Enamorus"),
|
||||||
|
[SPECIES_ENAMORUS_THERIAN] = _("Enamorus"),
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue