diff --git a/graphics/pokemon/terapagos/anim_front.png b/graphics/pokemon/terapagos/anim_front.png new file mode 100644 index 0000000000..4ef2270bd3 Binary files /dev/null and b/graphics/pokemon/terapagos/anim_front.png differ diff --git a/graphics/pokemon/terapagos/back.png b/graphics/pokemon/terapagos/back.png new file mode 100644 index 0000000000..8ec4f6c5b0 Binary files /dev/null and b/graphics/pokemon/terapagos/back.png differ diff --git a/graphics/pokemon/terapagos/normal.pal b/graphics/pokemon/terapagos/normal.pal new file mode 100644 index 0000000000..533a2e7c68 --- /dev/null +++ b/graphics/pokemon/terapagos/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +38 26 108 +49 34 133 +103 230 225 +60 76 160 +160 64 109 +228 103 181 +0 0 0 +115 162 235 +52 201 163 +76 244 204 +153 228 201 +230 244 173 +205 251 128 +63 50 194 +255 255 255 diff --git a/graphics/pokemon/terapagos/shiny.pal b/graphics/pokemon/terapagos/shiny.pal new file mode 100644 index 0000000000..1a59467bd6 --- /dev/null +++ b/graphics/pokemon/terapagos/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +37 114 136 +66 151 189 +151 58 210 +63 209 230 +160 64 109 +234 243 49 +0 0 0 +218 32 48 +52 201 163 +76 244 204 +153 228 201 +230 244 173 +205 251 128 +63 50 194 +255 255 255 diff --git a/graphics/pokemon/terapagos/terastal/anim_front.png b/graphics/pokemon/terapagos/terastal/anim_front.png new file mode 100644 index 0000000000..90a42f88b5 Binary files /dev/null and b/graphics/pokemon/terapagos/terastal/anim_front.png differ diff --git a/graphics/pokemon/terapagos/terastal/back.png b/graphics/pokemon/terapagos/terastal/back.png new file mode 100644 index 0000000000..cfa96b0ab0 Binary files /dev/null and b/graphics/pokemon/terapagos/terastal/back.png differ diff --git a/graphics/pokemon/terapagos/terastal/normal.pal b/graphics/pokemon/terapagos/terastal/normal.pal new file mode 100644 index 0000000000..453f7ce70c --- /dev/null +++ b/graphics/pokemon/terapagos/terastal/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +90 53 7 +42 121 78 +70 70 70 +215 38 89 +41 45 164 +77 151 158 +78 190 242 +170 172 227 +122 228 243 +147 245 227 +252 252 182 +255 255 255 +52 66 152 +0 200 255 +197 34 91 diff --git a/graphics/pokemon/terapagos/terastal/shiny.pal b/graphics/pokemon/terapagos/terastal/shiny.pal new file mode 100644 index 0000000000..f6103ac9f6 --- /dev/null +++ b/graphics/pokemon/terapagos/terastal/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +90 53 7 +42 121 78 +70 70 70 +215 38 89 +41 45 164 +77 151 158 +78 190 242 +170 172 227 +122 228 243 +147 245 227 +252 252 182 +255 255 255 +84 215 251 +255 0 0 +244 255 0 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 8df9aed98c..aacb27d068 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -13026,19 +13026,19 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar #endif //P_FAMILY_IRON_CROWN #if P_FAMILY_TERAPAGOS - // const u32 gMonFrontPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/front.4bpp.lz"); - // const u32 gMonPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/normal.gbapal.lz"); - // const u32 gMonBackPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/back.4bpp.lz"); - // const u32 gMonShinyPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/shiny.gbapal.lz"); + const u32 gMonFrontPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/anim_front.4bpp.lz"); + const u32 gMonPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/normal.gbapal.lz"); + const u32 gMonBackPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/back.4bpp.lz"); + const u32 gMonShinyPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/shiny.gbapal.lz"); const u8 gMonIcon_TerapagosNormal[] = INCBIN_U8("graphics/pokemon/terapagos/icon.4bpp"); #if P_FOOTPRINTS const u8 gMonFootprint_TerapagosNormal[] = INCBIN_U8("graphics/pokemon/terapagos/footprint.1bpp"); #endif //P_FOOTPRINTS - // const u32 gMonFrontPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/front.4bpp.lz"); - // const u32 gMonPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/normal.gbapal.lz"); - // const u32 gMonBackPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/back.4bpp.lz"); - // const u32 gMonShinyPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/shiny.gbapal.lz"); + const u32 gMonFrontPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/anim_front.4bpp.lz"); + const u32 gMonPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/normal.gbapal.lz"); + const u32 gMonBackPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/back.4bpp.lz"); + const u32 gMonShinyPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/shiny.gbapal.lz"); const u8 gMonIcon_TerapagosTerastal[] = INCBIN_U8("graphics/pokemon/terapagos/terastal/icon.4bpp"); #if P_FOOTPRINTS const u8 gMonFootprint_TerapagosTerastal[] = INCBIN_U8("graphics/pokemon/terapagos/terastal/footprint.1bpp"); diff --git a/src/data/pokemon/species_info/gen_9_families.h b/src/data/pokemon/species_info/gen_9_families.h index cb00555311..6c1d917315 100644 --- a/src/data/pokemon/species_info/gen_9_families.h +++ b/src/data/pokemon/species_info/gen_9_families.h @@ -6576,17 +6576,18 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - //.frontPic = gMonFrontPic_TerapagosNormal, - //.frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPic = gMonFrontPic_TerapagosNormal, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_TerapagosNormal, - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //.backPic = gMonBackPic_TerapagosNormal, - //.backPicSize = MON_COORDS_SIZE(64, 64), + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + .enemyMonElevation = 1, + .backPic = gMonBackPic_TerapagosNormal, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, - //.backAnimId = BACK_ANIM_NONE, - //.palette = gMonPalette_TerapagosNormal, - //.shinyPalette = gMonShinyPalette_TerapagosNormal, + .backAnimId = BACK_ANIM_NONE, + .palette = gMonPalette_TerapagosNormal, + .shinyPalette = gMonShinyPalette_TerapagosNormal, .iconSprite = gMonIcon_TerapagosNormal, .iconPalIndex = 0, FOOTPRINT(TerapagosNormal) @@ -6632,17 +6633,18 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - //.frontPic = gMonFrontPic_TerapagosTerastal, - //.frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 0, + .frontPic = gMonFrontPic_TerapagosTerastal, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicYOffset = 8, .frontAnimFrames = sAnims_TerapagosTerastal, - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //.backPic = gMonBackPic_TerapagosTerastal, - //.backPicSize = MON_COORDS_SIZE(64, 64), + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + .enemyMonElevation = 1, + .backPic = gMonBackPic_TerapagosTerastal, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, - //.backAnimId = BACK_ANIM_NONE, - //.palette = gMonPalette_TerapagosTerastal, - //.shinyPalette = gMonShinyPalette_TerapagosTerastal, + .backAnimId = BACK_ANIM_NONE, + .palette = gMonPalette_TerapagosTerastal, + .shinyPalette = gMonShinyPalette_TerapagosTerastal, .iconSprite = gMonIcon_TerapagosTerastal, .iconPalIndex = 0, FOOTPRINT(TerapagosTerastal) diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index ab8707ac5d..d802521afe 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -10120,8 +10120,20 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(IronCrown); #endif //P_FAMILY_IRON_CROWN #if P_FAMILY_TERAPAGOS -PLACEHOLDER_ANIM_SINGLE_FRAME(TerapagosNormal); -PLACEHOLDER_ANIM_SINGLE_FRAME(TerapagosTerastal); +static const union AnimCmd sAnim_TerapagosNormal_1[] = +{ + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; +static const union AnimCmd sAnim_TerapagosTerastal_1[] = +{ + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; PLACEHOLDER_ANIM_SINGLE_FRAME(TerapagosStellar); #endif //P_FAMILY_TERAPAGOS