From 6eccf019dbbca1a4fc08ac09233c964524b687f2 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 21 Jul 2020 19:32:33 -0400 Subject: [PATCH] Fixed missing changes. --- .../pokemon_graphics/back_pic_coordinates.h | 42 ++++++++-------- .../pokemon_graphics/front_pic_coordinates.h | 48 +++++++++---------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 30ef712b1..131ac13d9 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -233,7 +233,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_PARAS] = { .size = 0x63, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_PARASECT] = { @@ -408,7 +408,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_MAGNEMITE] = { .size = 0x43, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_MAGNETON] = { @@ -663,7 +663,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_DITTO] = { .size = 0x54, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_EEVEE] = { @@ -838,7 +838,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_SPINARAK] = { .size = 0x73, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_ARIADOS] = { @@ -888,7 +888,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_NATU] = { .size = 0x54, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_XATU] = { @@ -1103,7 +1103,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_SWINUB] = { .size = 0x63, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_PILOSWINE] = { @@ -1458,7 +1458,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_SILCOON] = { .size = 0x83, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_BEAUTIFLY] = { @@ -1468,12 +1468,12 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_CASCOON] = { .size = 0x73, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_DUSTOX] = { .size = 0x83, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_LOTAD] = { @@ -1508,7 +1508,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_NINCADA] = { .size = 0x83, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_NINJASK] = { @@ -1523,7 +1523,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_TAILLOW] = { .size = 0x64, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_SWELLOW] = { @@ -1568,12 +1568,12 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_WAILMER] = { .size = 0x83, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_WAILORD] = { .size = 0x83, - .y_offset = 0x16, + .y_offset = 22, }, [SPECIES_SKITTY] = { @@ -1668,7 +1668,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_VIBRAVA] = { .size = 0x74, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_FLYGON] = { @@ -1703,12 +1703,12 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_CAMERUPT] = { .size = 0x84, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_SPHEAL] = { .size = 0x64, - .y_offset = 0x12, + .y_offset = 18, }, [SPECIES_SEALEO] = { @@ -1913,12 +1913,12 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_ARON] = { .size = 0x54, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_LAIRON] = { .size = 0x84, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_AGGRON] = { @@ -1953,7 +1953,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_ANORITH] = { .size = 0x83, - .y_offset = 0x17, + .y_offset = 23, }, [SPECIES_ARMALDO] = { @@ -2003,7 +2003,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_METAGROSS] = { .size = 0x83, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_REGIROCK] = { @@ -2023,7 +2023,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_KYOGRE] = { .size = 0x84, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_GROUDON] = { diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 90bf967af..b787877b9 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -303,7 +303,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_POLIWAG] = { .size = 0x74, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_POLIWHIRL] = { @@ -408,7 +408,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_MAGNEMITE] = { .size = 0x43, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_MAGNETON] = { @@ -503,7 +503,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_VOLTORB] = { .size = 0x44, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_ELECTRODE] = { @@ -663,7 +663,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_DITTO] = { .size = 0x54, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_EEVEE] = { @@ -703,7 +703,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_KABUTO] = { .size = 0x54, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_KABUTOPS] = { @@ -838,7 +838,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_SPINARAK] = { .size = 0x54, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_ARIADOS] = { @@ -1033,7 +1033,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_DUNSPARCE] = { .size = 0x74, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_GLIGAR] = { @@ -1458,7 +1458,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_SILCOON] = { .size = 0x75, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_BEAUTIFLY] = { @@ -1548,7 +1548,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_WINGULL] = { .size = 0x84, - .y_offset = 0x18, + .y_offset = 24, }, [SPECIES_PELIPPER] = { @@ -1628,7 +1628,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_LUVDISC] = { .size = 0x46, - .y_offset = 0x18, + .y_offset = 24, }, [SPECIES_CORPHISH] = { @@ -1793,7 +1793,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_SWABLU] = { .size = 0x76, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_ALTARIA] = { @@ -1928,7 +1928,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_CASTFORM] = { .size = 0x34, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_VOLBEAT] = { @@ -2083,12 +2083,12 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_UNOWN_E] = { .size = 0x44, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_UNOWN_F] = { .size = 0x44, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_UNOWN_G] = { @@ -2108,22 +2108,22 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_UNOWN_J] = { .size = 0x34, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_UNOWN_K] = { .size = 0x44, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_UNOWN_L] = { .size = 0x34, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_UNOWN_M] = { .size = 0x44, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_UNOWN_N] = { @@ -2138,17 +2138,17 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_UNOWN_P] = { .size = 0x34, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_UNOWN_Q] = { .size = 0x43, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_UNOWN_R] = { .size = 0x34, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_UNOWN_S] = { @@ -2173,17 +2173,17 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_UNOWN_W] = { .size = 0x44, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_UNOWN_X] = { .size = 0x33, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_UNOWN_Y] = { .size = 0x34, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_UNOWN_Z] = {