From f6bd9663ad9e10224615d2ff80f31fdb5a5e0fd2 Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Fri, 8 Dec 2023 11:13:14 +0100 Subject: [PATCH] Forgot to do coordinates for new sprites (#3646) --- .../pokemon_graphics/back_pic_coordinates.h | 18 +++++++-------- .../pokemon_graphics/front_pic_coordinates.h | 22 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 4aa4273535..0eaa1a5a3b 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -1009,13 +1009,13 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = #if P_GEN_9_POKEMON == TRUE [SPECIES_SPRIGATITO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_FLORAGATO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, - [SPECIES_MEOWSCARADA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_MEOWSCARADA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_FUECOCO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_CROCALOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CROCALOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_SKELEDIRGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_QUAXLY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_QUAXLY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, [SPECIES_QUAXWELL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_QUAQUAVAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_QUAQUAVAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_LECHONK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_OINKOLOGNE_MALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_OINKOLOGNE_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, @@ -1043,7 +1043,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_GARGANACL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_CHARCADET] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_ARMAROUGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_CERULEDGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_CERULEDGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_TADBULB] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_BELLIBOLT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_WATTREL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, @@ -1059,10 +1059,10 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_KLAWF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 20 }, [SPECIES_CAPSAKID] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, [SPECIES_SCOVILLAIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, - [SPECIES_RELLOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, - [SPECIES_RABSCA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_RELLOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, + [SPECIES_RABSCA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_FLITTLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, - [SPECIES_ESPATHRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, + [SPECIES_ESPATHRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_TINKATINK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, [SPECIES_TINKATUFF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_TINKATON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, @@ -1074,7 +1074,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_PALAFIN_HERO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_VAROOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, [SPECIES_REVAVROOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 }, - [SPECIES_CYCLIZAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, + [SPECIES_CYCLIZAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, [SPECIES_ORTHWORM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_GLIMMET] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, [SPECIES_GLIMMORA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 80506717c7..b39d31f7ff 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -981,20 +981,20 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_WYRDEER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_KLEAVOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_URSALUNA] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 2 }, - [SPECIES_BASCULEGION_MALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, + [SPECIES_BASCULEGION_MALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SNEASLER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_OVERQWIL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_ENAMORUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, #endif #if P_GEN_9_POKEMON == TRUE - [SPECIES_SPRIGATITO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, + [SPECIES_SPRIGATITO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_FLORAGATO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_MEOWSCARADA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_FUECOCO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_CROCALOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_SKELEDIRGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_QUAXLY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, - [SPECIES_QUAXWELL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_QUAXLY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_QUAXWELL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_QUAQUAVAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_LECHONK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, [SPECIES_OINKOLOGNE_MALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, @@ -1022,7 +1022,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_NACLSTACK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_GARGANACL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_CHARCADET] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_ARMAROUGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ARMAROUGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_CERULEDGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_TADBULB] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_BELLIBOLT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, @@ -1039,10 +1039,10 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_KLAWF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, [SPECIES_CAPSAKID] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, [SPECIES_SCOVILLAIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_RELLOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, - [SPECIES_RABSCA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_RELLOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 17 }, + [SPECIES_RABSCA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_FLITTLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, - [SPECIES_ESPATHRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ESPATHRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_TINKATINK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_TINKATUFF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_TINKATON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, @@ -1054,7 +1054,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_PALAFIN_HERO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_VAROOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, [SPECIES_REVAVROOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, - [SPECIES_CYCLIZAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_CYCLIZAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_ORTHWORM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_GLIMMET] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 }, [SPECIES_GLIMMORA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, @@ -1102,7 +1102,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_MIRAIDON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_WALKING_WAKE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_IRON_LEAVES] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_DIPPLIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_DIPPLIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_POLTCHAGEIST_COUNTERFEIT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_POLTCHAGEIST_ARTISAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_SINISTCHA_UNREMARKABLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, @@ -1530,7 +1530,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = // Enamorus [SPECIES_ENAMORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, // Basculegion - [SPECIES_BASCULEGION_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, + [SPECIES_BASCULEGION_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, // Gigantamax Forms [SPECIES_VENUSAUR_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_CHARIZARD_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },