diff --git a/graphics/pokemon/farigiraf/icon.png b/graphics/pokemon/farigiraf/icon.png index e5e268534a..0ef8b01ae8 100755 Binary files a/graphics/pokemon/farigiraf/icon.png and b/graphics/pokemon/farigiraf/icon.png differ diff --git a/graphics/pokemon/flittle/back.png b/graphics/pokemon/flittle/back.png index d63fd8de26..87d517ebeb 100644 Binary files a/graphics/pokemon/flittle/back.png and b/graphics/pokemon/flittle/back.png differ diff --git a/graphics/pokemon/flittle/front.png b/graphics/pokemon/flittle/front.png index 945a5fa71f..c0d7054a06 100644 Binary files a/graphics/pokemon/flittle/front.png and b/graphics/pokemon/flittle/front.png differ diff --git a/graphics/pokemon/flittle/normal.pal b/graphics/pokemon/flittle/normal.pal index c64da1ad07..1918bb79c6 100644 --- a/graphics/pokemon/flittle/normal.pal +++ b/graphics/pokemon/flittle/normal.pal @@ -1,19 +1,18 @@ JASC-PAL 0100 -16 -152 208 163 -0 92 110 -221 239 241 -118 185 195 -169 123 0 -0 0 0 -255 213 0 -106 35 0 -227 169 0 -169 110 214 -0 125 194 -125 60 173 -255 64 182 -211 11 113 -255 100 218 -255 116 0 +15 +153 210 164 +120 120 120 +255 255 255 +183 185 186 +15 15 15 +141 121 50 +255 247 147 +210 187 104 +126 110 198 +159 120 0 +169 200 243 +192 85 122 +242 138 165 +138 54 90 +217 112 6 diff --git a/graphics/pokemon/flittle/shiny.pal b/graphics/pokemon/flittle/shiny.pal index fec76f8365..1636e312ad 100644 --- a/graphics/pokemon/flittle/shiny.pal +++ b/graphics/pokemon/flittle/shiny.pal @@ -1,19 +1,18 @@ JASC-PAL 0100 -16 -152 208 163 -0 92 110 -221 239 241 -118 185 195 -169 123 0 -0 0 0 -255 213 0 -106 35 0 -227 169 0 -169 110 214 -0 125 194 -125 60 173 -89 199 91 -0 150 59 -109 255 181 -132 64 31 +15 +153 210 164 +120 120 120 +255 255 255 +183 185 186 +15 15 15 +141 121 50 +255 247 147 +210 187 104 +126 110 198 +159 120 0 +169 200 243 +48 169 112 +73 224 149 +36 115 71 +126 92 72 diff --git a/graphics/pokemon/frigibax/anim_front.png b/graphics/pokemon/frigibax/anim_front.png new file mode 100644 index 0000000000..cfdaf7de70 Binary files /dev/null and b/graphics/pokemon/frigibax/anim_front.png differ diff --git a/graphics/pokemon/frigibax/front.png b/graphics/pokemon/frigibax/front.png deleted file mode 100644 index 603760b05a..0000000000 Binary files a/graphics/pokemon/frigibax/front.png and /dev/null differ diff --git a/graphics/pokemon/gimmighoul/roaming/icon.png b/graphics/pokemon/gimmighoul/roaming/icon.png new file mode 100644 index 0000000000..e803b52554 Binary files /dev/null and b/graphics/pokemon/gimmighoul/roaming/icon.png differ diff --git a/graphics/pokemon/great_tusk/anim_front.png b/graphics/pokemon/great_tusk/anim_front.png new file mode 100644 index 0000000000..3b7c202460 Binary files /dev/null and b/graphics/pokemon/great_tusk/anim_front.png differ diff --git a/graphics/pokemon/great_tusk/front.png b/graphics/pokemon/great_tusk/front.png deleted file mode 100644 index bcc34429d2..0000000000 Binary files a/graphics/pokemon/great_tusk/front.png and /dev/null differ diff --git a/graphics/pokemon/rabsca/back.png b/graphics/pokemon/rabsca/back.png index 3bb97d7a6c..9fea6d557a 100644 Binary files a/graphics/pokemon/rabsca/back.png and b/graphics/pokemon/rabsca/back.png differ diff --git a/graphics/pokemon/rabsca/front.png b/graphics/pokemon/rabsca/front.png index 45e974736e..becbd23ed1 100644 Binary files a/graphics/pokemon/rabsca/front.png and b/graphics/pokemon/rabsca/front.png differ diff --git a/graphics/pokemon/rabsca/normal.pal b/graphics/pokemon/rabsca/normal.pal index 5be86a05d8..6935e5a615 100644 --- a/graphics/pokemon/rabsca/normal.pal +++ b/graphics/pokemon/rabsca/normal.pal @@ -1,19 +1,18 @@ JASC-PAL 0100 -16 -0 215 150 -206 0 119 -255 0 255 -255 0 196 -255 3 107 -255 0 72 -255 40 149 +15 +153 210 164 +117 0 130 +171 14 171 +227 16 251 +194 36 97 +154 27 72 +247 57 131 248 248 248 -0 74 92 -0 53 74 -0 0 0 -0 197 231 -166 156 167 -231 0 8 -255 69 90 -0 214 160 +152 151 157 +63 79 92 +76 133 164 +24 24 24 +107 192 221 +106 32 39 +201 76 90 diff --git a/graphics/pokemon/rabsca/shiny.pal b/graphics/pokemon/rabsca/shiny.pal new file mode 100644 index 0000000000..d3f26a3e93 --- /dev/null +++ b/graphics/pokemon/rabsca/shiny.pal @@ -0,0 +1,18 @@ +JASC-PAL +0100 +15 +153 210 164 +117 0 130 +171 14 171 +227 16 251 +194 36 97 +154 27 72 +247 57 131 +248 248 248 +152 151 157 +63 79 92 +204 174 41 +24 24 24 +249 240 73 +106 32 39 +201 76 90 diff --git a/graphics/pokemon/rellor/back.png b/graphics/pokemon/rellor/back.png index 21fcbfbfef..9f4775beb3 100644 Binary files a/graphics/pokemon/rellor/back.png and b/graphics/pokemon/rellor/back.png differ diff --git a/graphics/pokemon/rellor/front.png b/graphics/pokemon/rellor/front.png index 9be53874b4..2310e9af52 100644 Binary files a/graphics/pokemon/rellor/front.png and b/graphics/pokemon/rellor/front.png differ diff --git a/graphics/pokemon/rellor/normal.pal b/graphics/pokemon/rellor/normal.pal index a8893d8adf..abe74d5ded 100644 --- a/graphics/pokemon/rellor/normal.pal +++ b/graphics/pokemon/rellor/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -124 210 161 -184 67 0 -242 99 32 -255 139 74 -255 187 177 -255 142 0 -69 17 0 -255 108 0 -128 75 40 +156 210 164 +246 242 246 +115 97 74 +180 68 148 +49 48 41 +148 198 156 +164 141 131 +197 182 172 +189 109 32 0 0 0 -149 123 90 -245 180 41 -255 149 141 -255 54 178 -242 242 242 -0 211 160 +180 165 98 +156 133 98 +82 80 65 +123 125 106 +246 133 32 +90 76 49 diff --git a/graphics/pokemon/rellor/shiny.pal b/graphics/pokemon/rellor/shiny.pal index 6f715ec097..c30b053170 100644 --- a/graphics/pokemon/rellor/shiny.pal +++ b/graphics/pokemon/rellor/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -124 210 161 -184 67 0 -255 161 0 -255 248 0 -255 249 0 -255 142 0 -69 17 0 -255 108 0 -128 75 40 +156 210 164 +246 242 246 +215 179 36 +82 109 157 +49 48 41 +148 198 156 +214 179 36 +241 243 37 +214 179 36 0 0 0 -149 123 90 -245 180 41 -255 161 0 -0 120 183 -242 242 242 -0 211 160 +180 165 98 +249 248 87 +82 80 65 +123 125 106 +241 243 37 +90 76 49 diff --git a/graphics/pokemon/scovillain/icon.png b/graphics/pokemon/scovillain/icon.png index 9dea3d8e12..f346a1cb48 100755 Binary files a/graphics/pokemon/scovillain/icon.png and b/graphics/pokemon/scovillain/icon.png differ diff --git a/include/graphics.h b/include/graphics.h index 6681f3a5e8..335f0e6d99 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -8041,6 +8041,7 @@ extern const u32 gMonFrontPic_GimmighoulRoaming[]; extern const u32 gMonPalette_GimmighoulRoaming[]; extern const u32 gMonBackPic_GimmighoulRoaming[]; extern const u32 gMonShinyPalette_GimmighoulRoaming[]; +extern const u8 gMonIcon_GimmighoulRoaming[]; extern const u32 gMonFrontPic_Gholdengo[]; extern const u32 gMonPalette_Gholdengo[]; extern const u32 gMonBackPic_Gholdengo[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 4641892b12..1857dd5442 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -7733,7 +7733,7 @@ const u8 gMonIcon_Rellor[] = INCBIN_U8("graphics/pokemon/rellor/icon.4bpp"); const u32 gMonFrontPic_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/front.4bpp.lz"); const u32 gMonPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/normal.gbapal.lz"); const u32 gMonBackPic_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/back.4bpp.lz"); -// const u32 gMonShinyPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/shiny.gbapal.lz"); const u8 gMonIcon_Rabsca[] = INCBIN_U8("graphics/pokemon/rabsca/icon.4bpp"); // const u8 gMonFootprint_Rabsca[] = INCBIN_U8("graphics/pokemon/rabsca/footprint.1bpp"); @@ -7962,7 +7962,7 @@ const u32 gMonShinyPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/ const u8 gMonIcon_Kingambit[] = INCBIN_U8("graphics/pokemon/kingambit/icon.4bpp"); // const u8 gMonFootprint_Kingambit[] = INCBIN_U8("graphics/pokemon/kingambit/footprint.1bpp"); -const u32 gMonFrontPic_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/front.4bpp.lz"); +const u32 gMonFrontPic_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/anim_front.4bpp.lz"); const u32 gMonPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/normal.gbapal.lz"); const u32 gMonBackPic_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/back.4bpp.lz"); const u32 gMonShinyPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/shiny.gbapal.lz"); @@ -8046,7 +8046,7 @@ const u32 gMonShinyPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thor const u8 gMonIcon_IronThorns[] = INCBIN_U8("graphics/pokemon/iron_thorns/icon.4bpp"); // const u8 gMonFootprint_IronThorns[] = INCBIN_U8("graphics/pokemon/iron_thorns/footprint.1bpp"); -const u32 gMonFrontPic_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/front.4bpp.lz"); +const u32 gMonFrontPic_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/anim_front.4bpp.lz"); const u32 gMonPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/normal.gbapal.lz"); const u32 gMonBackPic_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/back.4bpp.lz"); const u32 gMonShinyPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/shiny.gbapal.lz"); @@ -8078,7 +8078,7 @@ const u32 gMonFrontPic_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmig const u32 gMonPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/normal.gbapal.lz"); const u32 gMonBackPic_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/back.4bpp.lz"); const u32 gMonShinyPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/shiny.gbapal.lz"); -// const u8 gMonIcon_GimmighoulRoaming[] = INCBIN_U8("graphics/pokemon/gimmighoul/icon.4bpp"); +const u8 gMonIcon_GimmighoulRoaming[] = INCBIN_U8("graphics/pokemon/gimmighoul/roaming/icon.4bpp"); const u32 gMonFrontPic_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/front.4bpp.lz"); const u32 gMonPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/normal.gbapal.lz"); diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 99ef6a17ef..2924cf5473 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -996,9 +996,9 @@ 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 = 3 }, - [SPECIES_RELLOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, + [SPECIES_RELLOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, [SPECIES_RABSCA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FLITTLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_FLITTLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, [SPECIES_ESPATHRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_TINKATINK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, [SPECIES_TINKATUFF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h index c1fdcb8c9d..004e1be917 100644 --- a/src/data/pokemon_graphics/enemy_mon_elevation.h +++ b/src/data/pokemon_graphics/enemy_mon_elevation.h @@ -281,6 +281,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_IRON_JUGULIS] = 7, [SPECIES_IRON_MOTH] = 4, [SPECIES_CHI_YU] = 2, + [SPECIES_ROARING_MOON] = 20, #endif [SPECIES_BUTTERFREE_GIGANTAMAX] = 10, }; diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 7b02eb29b8..dc2da08f48 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -10782,7 +10782,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Clodsire); PLACEHOLDER_ANIM_SINGLE_FRAME(Farigiraf); PLACEHOLDER_ANIM_SINGLE_FRAME(Dudunsparce); PLACEHOLDER_ANIM_SINGLE_FRAME(Kingambit); -PLACEHOLDER_ANIM_SINGLE_FRAME(GreatTusk); +PLACEHOLDER_TWO_FRAME_ANIMATION(GreatTusk); PLACEHOLDER_ANIM_SINGLE_FRAME(ScreamTail); PLACEHOLDER_ANIM_SINGLE_FRAME(BruteBonnet); PLACEHOLDER_ANIM_SINGLE_FRAME(FlutterMane); @@ -10794,7 +10794,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(IronHands); PLACEHOLDER_ANIM_SINGLE_FRAME(IronJugulis); PLACEHOLDER_ANIM_SINGLE_FRAME(IronMoth); PLACEHOLDER_ANIM_SINGLE_FRAME(IronThorns); -PLACEHOLDER_ANIM_SINGLE_FRAME(Frigibax); +PLACEHOLDER_TWO_FRAME_ANIMATION(Frigibax); PLACEHOLDER_ANIM_SINGLE_FRAME(Arctibax); PLACEHOLDER_ANIM_SINGLE_FRAME(Baxcalibur); PLACEHOLDER_ANIM_SINGLE_FRAME(Gimmighoul); diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 6129ade830..2782ee94c7 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -977,9 +977,9 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_KLAWF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_CAPSAKID] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_SCOVILLAIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_RELLOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_RELLOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_RABSCA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FLITTLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, + [SPECIES_FLITTLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, [SPECIES_ESPATHRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_TINKATINK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_TINKATUFF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 2c79cdd4b2..a5ee82358c 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -1427,7 +1427,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(CAPSAKID, gMonShinyPalette_Capsakid), SPECIES_SHINY_PAL(SCOVILLAIN, gMonShinyPalette_Scovillain), SPECIES_SHINY_PAL(RELLOR, gMonShinyPalette_Rellor), - // SPECIES_SHINY_PAL(RABSCA, gMonShinyPalette_Rabsca), + SPECIES_SHINY_PAL(RABSCA, gMonShinyPalette_Rabsca), SPECIES_SHINY_PAL(FLITTLE, gMonShinyPalette_Flittle), SPECIES_SHINY_PAL(ESPATHRA, gMonShinyPalette_Espathra), SPECIES_SHINY_PAL(TINKATINK, gMonShinyPalette_Tinkatink), diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index f673df9696..bf0be741be 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1438,7 +1438,7 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_ARCTIBAX] = gMonIcon_Arctibax, [SPECIES_BAXCALIBUR] = gMonIcon_Baxcalibur, [SPECIES_GIMMIGHOUL_CHEST] = gMonIcon_GimmighoulChest, - //[SPECIES_GIMMIGHOUL_ROAMING] = gMonIcon_GimmighoulRoaming, + [SPECIES_GIMMIGHOUL_ROAMING] = gMonIcon_GimmighoulRoaming, [SPECIES_GHOLDENGO] = gMonIcon_Gholdengo, [SPECIES_WO_CHIEN] = gMonIcon_WoChien, [SPECIES_CHIEN_PAO] = gMonIcon_ChienPao, @@ -2824,7 +2824,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ARCTIBAX] = 0, [SPECIES_BAXCALIBUR] = 0, [SPECIES_GIMMIGHOUL_CHEST] = 0, - [SPECIES_GIMMIGHOUL_ROAMING] = 1, + [SPECIES_GIMMIGHOUL_ROAMING] = 0, [SPECIES_GHOLDENGO] = 0, [SPECIES_WO_CHIEN] = 5, [SPECIES_CHIEN_PAO] = 0,