From 0756dc1d4acf14fb9f99864fdb6834bef5fde836 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 23 Oct 2023 20:26:21 +0200 Subject: [PATCH] coords and roaring moon --- graphics/pokemon/roaring_moon/back.png | Bin 748 -> 733 bytes graphics/pokemon/roaring_moon/front.png | Bin 1184 -> 1189 bytes graphics/pokemon/roaring_moon/normal.pal | 30 +++++++++--------- graphics/pokemon/roaring_moon/shiny.pal | 30 +++++++++--------- .../pokemon_graphics/back_pic_coordinates.h | 20 ++++++------ .../pokemon_graphics/front_pic_coordinates.h | 8 ++--- 6 files changed, 44 insertions(+), 44 deletions(-) diff --git a/graphics/pokemon/roaring_moon/back.png b/graphics/pokemon/roaring_moon/back.png index a4840356d1d00db80e33aea9cf7820cce549cdcf..01813ff4f991a2c94a962e9de624da21a9ddde06 100644 GIT binary patch delta 676 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 diff --git a/graphics/pokemon/roaring_moon/normal.pal b/graphics/pokemon/roaring_moon/normal.pal index 9021ba933f..2deb541050 100644 --- a/graphics/pokemon/roaring_moon/normal.pal +++ b/graphics/pokemon/roaring_moon/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -200 200 168 -62 140 179 -136 48 64 -88 200 248 -248 160 112 -200 72 80 -48 72 112 -152 224 248 +153 210 164 +39 88 94 +96 231 236 +60 137 171 0 0 0 -112 128 128 -192 192 208 -248 248 248 -80 72 72 -248 200 88 -200 160 72 -176 112 48 +185 107 230 +105 17 39 +214 38 82 +162 27 60 +129 100 179 +105 105 105 +171 171 171 +247 247 247 +247 165 42 +251 236 49 +52 49 49 diff --git a/graphics/pokemon/roaring_moon/shiny.pal b/graphics/pokemon/roaring_moon/shiny.pal index 4a9116f07f..42fb2538d7 100644 --- a/graphics/pokemon/roaring_moon/shiny.pal +++ b/graphics/pokemon/roaring_moon/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -200 200 168 -65 163 146 -136 48 64 -90 224 202 -248 160 112 -200 72 80 -48 72 112 -152 224 248 +153 210 164 +62 125 78 +151 235 188 +86 180 117 0 0 0 -112 128 128 -192 192 208 -248 248 248 -80 72 72 -248 200 88 -200 160 72 -176 112 48 +223 213 113 +105 17 39 +245 62 68 +181 36 39 +174 162 85 +105 105 105 +171 171 171 +247 247 247 +247 165 42 +251 236 49 +52 49 49 diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index bb2c5dd2a6..430374f840 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -957,13 +957,13 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_OINKOLOGNE_MALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_OINKOLOGNE_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_TAROUNTULA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, - [SPECIES_SPIDOPS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SPIDOPS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_NYMBLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, [SPECIES_LOKIX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_PAWMI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_PAWMO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_PAWMOT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, - [SPECIES_TANDEMAUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_TANDEMAUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, [SPECIES_FIDOUGH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, @@ -975,13 +975,13 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_NACLI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, + [SPECIES_NACLI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_NACLSTACK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [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_TADBULB] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, + [SPECIES_TADBULB] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_BELLIBOLT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_WATTREL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, [SPECIES_KILOWATTREL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, @@ -1001,7 +1001,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_FLITTLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ESPATHRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_TINKATINK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, - [SPECIES_TINKATUFF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_TINKATUFF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_TINKATON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_WIGLETT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, [SPECIES_WUGTRIO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, @@ -1031,7 +1031,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_DUDUNSPARCE_TWO_SEGMENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_KINGAMBIT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GREAT_TUSK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_GREAT_TUSK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_SCREAM_TAIL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_BRUTE_BONNET] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, [SPECIES_FLUTTER_MANE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, @@ -1041,23 +1041,23 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_IRON_BUNDLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_IRON_HANDS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_IRON_JUGULIS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_IRON_MOTH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_IRON_MOTH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_IRON_THORNS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_FRIGIBAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_ARCTIBAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_BAXCALIBUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_GIMMIGHOUL_CHEST] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_GIMMIGHOUL_ROAMING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_GHOLDENGO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GHOLDENGO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_WO_CHIEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_CHIEN_PAO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_TING_LU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_TING_LU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_CHI_YU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ROARING_MOON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_IRON_VALIANT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_KORAIDON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_MIRAIDON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_WALKING_WAKE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_WALKING_WAKE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_IRON_LEAVES] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, #endif #if P_GEN_5_POKEMON == TRUE diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index dd0a04d997..6129ade830 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -939,12 +939,12 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_OINKOLOGNE_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_TAROUNTULA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_SPIDOPS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_NYMBLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_NYMBLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_LOKIX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_PAWMI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_PAWMO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_PAWMOT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TANDEMAUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_TANDEMAUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_FIDOUGH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, @@ -1009,8 +1009,8 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_ANNIHILAPE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CLODSIRE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_FARIGIRAF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_DUDUNSPARCE_TWO_SEGMENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_DUDUNSPARCE_TWO_SEGMENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_KINGAMBIT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_GREAT_TUSK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_SCREAM_TAIL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 },