Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Normal and Terastal Terapagos sprites #4691

Merged
merged 1 commit into from
Jun 2, 2024
Merged

Added Normal and Terastal Terapagos sprites #4691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added graphics/pokemon/terapagos/anim_front.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/terapagos/back.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions graphics/pokemon/terapagos/normal.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
19 changes: 19 additions & 0 deletions graphics/pokemon/terapagos/shiny.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Binary file added graphics/pokemon/terapagos/terastal/anim_front.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/terapagos/terastal/back.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions graphics/pokemon/terapagos/terastal/normal.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
19 changes: 19 additions & 0 deletions graphics/pokemon/terapagos/terastal/shiny.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
16 changes: 8 additions & 8 deletions src/data/graphics/pokemon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13046,19 +13046,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");
Expand Down
36 changes: 19 additions & 17 deletions src/data/pokemon/species_info/gen_9_families.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6619,17 +6619,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)
Expand Down Expand Up @@ -6676,17 +6677,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)
Expand Down
16 changes: 14 additions & 2 deletions src/data/pokemon_graphics/front_pic_anims.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading