Basculegion female form

This commit is contained in:
Alex 2023-02-24 08:46:34 +01:00
parent a870ec3c22
commit 48391d8eff
12 changed files with 57 additions and 65 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 633 B

After

Width:  |  Height:  |  Size: 628 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 928 B

After

Width:  |  Height:  |  Size: 939 B

View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
48 140 88
98 98 98
16 16 16
16 64 32
120 168 168
64 80 80
232 228 176
96 60 40
32 48 56
168 220 224
32 96 56
96 96 96
224 228 224
160 164 160
40 92 120
224 240 232
46 92 120
171 222 224
230 230 230
227 242 239
164 164 164
122 168 175
32 49 57
65 82 82
55 140 89
21 64 34
34 96 61
16 16 18
99 62 41

View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
96 147 49
98 98 98
16 16 16
16 64 32
164 152 77
79 108 60
232 228 176
96 60 40
32 48 56
222 208 114
79 108 60
96 96 96
224 228 224
160 164 160
115 99 68
249 236 166
112 96 64
216 208 112
230 230 230
248 236 160
164 164 164
160 152 72
32 49 57
64 80 80
96 144 48
21 64 34
72 108 56
16 16 18
99 62 41

View File

@ -990,7 +990,6 @@ extern const u32 gMonFrontPic_Wyrdeer[];
extern const u32 gMonFrontPic_Kleavor[];
extern const u32 gMonFrontPic_Ursaluna[];
extern const u32 gMonFrontPic_Basculegion[];
extern const u32 gMonFrontPic_BasculegionF[];
extern const u32 gMonFrontPic_Sneasler[];
extern const u32 gMonFrontPic_Overqwil[];
extern const u32 gMonFrontPic_Enamorus[];
@ -1276,7 +1275,8 @@ extern const u32 gMonFrontPic_UrshifuRapidStrikeStyle[];
extern const u32 gMonFrontPic_ZarudeDada[];
extern const u32 gMonFrontPic_CalyrexIceRider[];
extern const u32 gMonFrontPic_CalyrexShadowRider[];
//extern const u32 gMonFrontPic_EnamorusTherian[];
extern const u32 gMonFrontPic_EnamorusTherian[];
extern const u32 gMonFrontPic_BasculegionFemale[];
#endif
extern const u32 gMonFrontPic_Egg[];
@ -2204,7 +2204,6 @@ extern const u32 gMonBackPic_Wyrdeer[];
extern const u32 gMonBackPic_Kleavor[];
extern const u32 gMonBackPic_Ursaluna[];
extern const u32 gMonBackPic_Basculegion[];
extern const u32 gMonBackPic_BasculegionF[];
extern const u32 gMonBackPic_Sneasler[];
extern const u32 gMonBackPic_Overqwil[];
extern const u32 gMonBackPic_Enamorus[];
@ -2488,7 +2487,8 @@ extern const u32 gMonBackPic_UrshifuRapidStrikeStyle[];
extern const u32 gMonBackPic_ZarudeDada[];
extern const u32 gMonBackPic_CalyrexIceRider[];
extern const u32 gMonBackPic_CalyrexShadowRider[];
//extern const u32 gMonBackPic_EnamorusTherian[];
extern const u32 gMonBackPic_EnamorusTherian[];
extern const u32 gMonBackPic_BasculegionFemale[];
#endif
extern const u32 gMonPalette_CircledQuestionMark[];
@ -3410,7 +3410,6 @@ extern const u32 gMonPalette_Wyrdeer[];
extern const u32 gMonPalette_Kleavor[];
extern const u32 gMonPalette_Ursaluna[];
extern const u32 gMonPalette_Basculegion[];
extern const u32 gMonPalette_BasculegionF[];
extern const u32 gMonPalette_Sneasler[];
extern const u32 gMonPalette_Overqwil[];
extern const u32 gMonPalette_Enamorus[];
@ -3720,7 +3719,8 @@ extern const u32 gMonPalette_UrshifuRapidStrikeStyle[];
extern const u32 gMonPalette_ZarudeDada[];
extern const u32 gMonPalette_CalyrexIceRider[];
extern const u32 gMonPalette_CalyrexShadowRider[];
//extern const u32 gMonPalette_EnamorusTherian[];
extern const u32 gMonPalette_EnamorusTherian[];
extern const u32 gMonPalette_BasculegionFemale[];
#endif
extern const u32 gMonPalette_Egg[];
@ -4643,7 +4643,6 @@ extern const u32 gMonShinyPalette_Wyrdeer[];
extern const u32 gMonShinyPalette_Kleavor[];
extern const u32 gMonShinyPalette_Ursaluna[];
extern const u32 gMonShinyPalette_Basculegion[];
extern const u32 gMonShinyPalette_BasculegionF[];
extern const u32 gMonShinyPalette_Sneasler[];
extern const u32 gMonShinyPalette_Overqwil[];
extern const u32 gMonShinyPalette_Enamorus[];
@ -4948,6 +4947,7 @@ extern const u32 gMonShinyPalette_ZarudeDada[];
extern const u32 gMonShinyPalette_CalyrexIceRider[];
extern const u32 gMonShinyPalette_CalyrexShadowRider[];
extern const u32 gMonShinyPalette_EnamorusTherian[];
extern const u32 gMonShinyPalette_BasculegionFemale[];
#endif
extern const u8 gMonIcon_QuestionMark[];
@ -5870,7 +5870,6 @@ extern const u8 gMonIcon_Wyrdeer[];
extern const u8 gMonIcon_Kleavor[];
extern const u8 gMonIcon_Ursaluna[];
extern const u8 gMonIcon_Basculegion[];
extern const u8 gMonIcon_BasculegionF[];
extern const u8 gMonIcon_Sneasler[];
extern const u8 gMonIcon_Overqwil[];
extern const u8 gMonIcon_Enamorus[];
@ -6168,6 +6167,7 @@ extern const u8 gMonIcon_ZarudeDada[];
extern const u8 gMonIcon_CalyrexIceRider[];
extern const u8 gMonIcon_CalyrexShadowRider[];
extern const u8 gMonIcon_EnamorusTherian[];
extern const u8 gMonIcon_BasculegionFemale[];
#endif
extern const u8 gMonIcon_Egg[];

View File

@ -923,7 +923,6 @@ const u32 gMonFrontPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/front.4b
const u32 gMonFrontPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/front.4bpp.lz");
const u32 gMonFrontPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/front.4bpp.lz");
const u32 gMonFrontPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/front.4bpp.lz");
const u32 gMonFrontPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/female/front.4bpp.lz");
const u32 gMonFrontPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/front.4bpp.lz");
const u32 gMonFrontPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/front.4bpp.lz");
const u32 gMonFrontPic_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/front.4bpp.lz");
@ -1207,7 +1206,8 @@ const u32 gMonFrontPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/
const u32 gMonFrontPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/front.4bpp.lz");
const u32 gMonFrontPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/front.4bpp.lz");
const u32 gMonFrontPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/front.4bpp.lz");
//const u32 gMonFrontPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/front.4bpp.lz");
const u32 gMonFrontPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/front.4bpp.lz");
const u32 gMonFrontPic_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/front.4bpp.lz");
#endif
const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/anim_front.4bpp.lz");
@ -2135,7 +2135,6 @@ const u32 gMonBackPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/back.4bpp
const u32 gMonBackPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/back.4bpp.lz");
const u32 gMonBackPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/back.4bpp.lz");
const u32 gMonBackPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/back.4bpp.lz");
const u32 gMonBackPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/female/back.4bpp.lz");
const u32 gMonBackPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/back.4bpp.lz");
const u32 gMonBackPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/back.4bpp.lz");
const u32 gMonBackPic_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/back.4bpp.lz");
@ -2419,7 +2418,8 @@ const u32 gMonBackPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/u
const u32 gMonBackPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/back.4bpp.lz");
const u32 gMonBackPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/back.4bpp.lz");
const u32 gMonBackPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/back.4bpp.lz");
//const u32 gMonBackPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/back.4bpp.lz");
const u32 gMonBackPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/back.4bpp.lz");
const u32 gMonBackPic_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/back.4bpp.lz");
#endif
const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/normal.gbapal.lz");
@ -3341,7 +3341,6 @@ const u32 gMonPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/normal.gb
const u32 gMonPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/normal.gbapal.lz");
const u32 gMonPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/normal.gbapal.lz");
const u32 gMonPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/normal.gbapal.lz");
const u32 gMonPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/female/normal.gbapal.lz");
const u32 gMonPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/normal.gbapal.lz");
const u32 gMonPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/normal.gbapal.lz");
const u32 gMonPalette_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/normal.gbapal.lz");
@ -3651,7 +3650,8 @@ const u32 gMonPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/u
const u32 gMonPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/normal.gbapal.lz");
const u32 gMonPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/normal.gbapal.lz");
const u32 gMonPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/normal.gbapal.lz");
//const u32 gMonPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/normal.gbapal.lz");
const u32 gMonPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/normal.gbapal.lz");
const u32 gMonPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/normal.gbapal.lz");
#endif
const u32 gMonPalette_Egg[] = INCBIN_U32("graphics/pokemon/egg/normal.gbapal.lz");
@ -4574,7 +4574,6 @@ const u32 gMonShinyPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/shin
const u32 gMonShinyPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/shiny.gbapal.lz");
const u32 gMonShinyPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/shiny.gbapal.lz");
const u32 gMonShinyPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/shiny.gbapal.lz");
const u32 gMonShinyPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/female/shiny.gbapal.lz");
const u32 gMonShinyPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/shiny.gbapal.lz");
const u32 gMonShinyPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/shiny.gbapal.lz");
const u32 gMonShinyPalette_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/shiny.gbapal.lz");
@ -4879,6 +4878,7 @@ const u32 gMonShinyPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/da
const u32 gMonShinyPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/shiny.gbapal.lz");
const u32 gMonShinyPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/shiny.gbapal.lz");
const u32 gMonShinyPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/shiny.gbapal.lz");
const u32 gMonShinyPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/shiny.gbapal.lz");
#endif
const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp");
@ -5801,7 +5801,6 @@ const u8 gMonIcon_Wyrdeer[] = INCBIN_U8("graphics/pokemon/wyrdeer/icon.4bpp");
const u8 gMonIcon_Kleavor[] = INCBIN_U8("graphics/pokemon/kleavor/icon.4bpp");
const u8 gMonIcon_Ursaluna[] = INCBIN_U8("graphics/pokemon/ursaluna/icon.4bpp");
const u8 gMonIcon_Basculegion[] = INCBIN_U8("graphics/pokemon/basculegion/icon.4bpp");
const u8 gMonIcon_BasculegionF[] = INCBIN_U8("graphics/pokemon/basculegion/female/icon.4bpp");
const u8 gMonIcon_Sneasler[] = INCBIN_U8("graphics/pokemon/sneasler/icon.4bpp");
const u8 gMonIcon_Overqwil[] = INCBIN_U8("graphics/pokemon/overqwil/icon.4bpp");
const u8 gMonIcon_Enamorus[] = INCBIN_U8("graphics/pokemon/enamorus/icon.4bpp");
@ -6099,6 +6098,7 @@ const u8 gMonIcon_ZarudeDada[] = INCBIN_U8("graphics/pokemon/zarude/dada/icon.4b
const u8 gMonIcon_CalyrexIceRider[] = INCBIN_U8("graphics/pokemon/calyrex/ice_rider/icon.4bpp");
const u8 gMonIcon_CalyrexShadowRider[] = INCBIN_U8("graphics/pokemon/calyrex/shadow_rider/icon.4bpp");
const u8 gMonIcon_EnamorusTherian[] = INCBIN_U8("graphics/pokemon/enamorus/therian/icon.4bpp");
const u8 gMonIcon_BasculegionFemale[] = INCBIN_U8("graphics/pokemon/basculegion/female/icon.4bpp");
#endif
const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp");

View File

@ -1042,7 +1042,7 @@ const struct MonCoords gMonBackPicCoords[] =
[SPECIES_ARCANINE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 },
[SPECIES_VOLTORB_HISUIAN] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 10 },
[SPECIES_ELECTRODE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 7 },
[SPECIES_TYPHLOSION_HISUIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 3 },
[SPECIES_TYPHLOSION_HISUIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 0 },
[SPECIES_QWILFISH_HISUIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 },
[SPECIES_SNEASEL_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 },
#if P_GEN_5_POKEMON == TRUE

View File

@ -1331,7 +1331,9 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(CALYREX_ICE_RIDER, gMonBackPic_CalyrexIceRider),
SPECIES_SPRITE(CALYREX_SHADOW_RIDER, gMonBackPic_CalyrexShadowRider),
SPECIES_SPRITE(ENAMORUS_THERIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_EnamorusTherian),
SPECIES_SPRITE(ENAMORUS_THERIAN, gMonBackPic_EnamorusTherian),
SPECIES_SPRITE(BASCULEGION_FEMALE, gMonBackPic_BasculegionFemale),
#endif
SPECIES_SPRITE(EGG, gMonFrontPic_Egg),
};
@ -1359,7 +1361,4 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[] =
#if P_GEN_6_POKEMON == TRUE
SPECIES_SPRITE(PYROAR, gMonBackPic_PyroarF),
#endif
#if P_GEN_8_POKEMON == TRUE
SPECIES_SPRITE(BASCULEGION, gMonBackPic_BasculegionF),
#endif
};

View File

@ -1330,7 +1330,9 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(CALYREX_ICE_RIDER, gMonFrontPic_CalyrexIceRider),
SPECIES_SPRITE(CALYREX_SHADOW_RIDER, gMonFrontPic_CalyrexShadowRider),
SPECIES_SPRITE(ENAMORUS_THERIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_EnamorusTherian),
SPECIES_SPRITE(ENAMORUS_THERIAN, gMonFrontPic_EnamorusTherian),
SPECIES_SPRITE(BASCULEGION_FEMALE, gMonFrontPic_BasculegionFemale),
#endif
SPECIES_SPRITE(EGG, gMonFrontPic_Egg),
};
@ -1358,7 +1360,4 @@ const struct CompressedSpriteSheet gMonFrontPicTableFemale[] =
#if P_GEN_6_POKEMON == TRUE
SPECIES_SPRITE(PYROAR, gMonFrontPic_PyroarF),
#endif
#if P_GEN_7_POKEMON == TRUE
SPECIES_SPRITE(BASCULEGION, gMonFrontPic_BasculegionF),
#endif
};

View File

@ -1330,7 +1330,8 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(CALYREX_ICE_RIDER, gMonPalette_CalyrexIceRider),
SPECIES_PAL(CALYREX_SHADOW_RIDER, gMonPalette_CalyrexShadowRider),
SPECIES_PAL(ENAMORUS_THERIAN, gMonPalette_CircledQuestionMark), // gMonPalette_EnamorusTherian),
SPECIES_PAL(ENAMORUS_THERIAN, gMonPalette_EnamorusTherian),
SPECIES_PAL(BASCULEGION_FEMALE, gMonPalette_BasculegionFemale),
#endif
SPECIES_PAL(EGG, gMonPalette_Egg),
};
@ -1358,7 +1359,4 @@ const struct CompressedSpritePalette gMonPaletteTableFemale[] =
#if P_GEN_6_POKEMON == TRUE
SPECIES_PAL(PYROAR, gMonPalette_Pyroar),
#endif
#if P_GEN_8_POKEMON == TRUE
SPECIES_PAL(BASCULEGION, gMonPalette_BasculegionF),
#endif
};

View File

@ -1330,6 +1330,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(CALYREX_SHADOW_RIDER, gMonShinyPalette_CalyrexShadowRider),
SPECIES_SHINY_PAL(ENAMORUS_THERIAN, gMonShinyPalette_EnamorusTherian),
SPECIES_SHINY_PAL(BASCULEGION_FEMALE, gMonShinyPalette_BasculegionFemale),
#endif
SPECIES_SHINY_PAL(EGG, gMonPalette_Egg),
};
@ -1357,7 +1359,4 @@ const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] =
#if P_GEN_6_POKEMON == TRUE
SPECIES_SHINY_PAL(PYROAR, gMonShinyPalette_Pyroar),
#endif
#if P_GEN_8_POKEMON == TRUE
SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_BasculegionF),
#endif
};

View File

@ -1293,7 +1293,7 @@ const u8 *const gMonIconTable[] =
[SPECIES_CALYREX_ICE_RIDER] = gMonIcon_CalyrexIceRider,
[SPECIES_CALYREX_SHADOW_RIDER] = gMonIcon_CalyrexShadowRider,
[SPECIES_ENAMORUS_THERIAN] = gMonIcon_EnamorusTherian,
[SPECIES_BASCULEGION_FEMALE] = gMonIcon_BasculegionF,
[SPECIES_BASCULEGION_FEMALE] = gMonIcon_BasculegionFemale,
#endif
[SPECIES_EGG] = gMonIcon_Egg,
};
@ -1326,9 +1326,6 @@ const u8 *const gMonIconTableFemale[] =
#if P_GEN_6_POKEMON == TRUE
[SPECIES_PYROAR] = gMonIcon_PyroarF,
#endif
#if P_GEN_8_POKEMON == TRUE
[SPECIES_BASCULEGION] = gMonIcon_Basculegion,
#endif
};
const u8 gMonIconPaletteIndices[] =
@ -2543,7 +2540,7 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_CALYREX_ICE_RIDER] = 0,
[SPECIES_CALYREX_SHADOW_RIDER] = 0,
[SPECIES_ENAMORUS_THERIAN] = 1,
[SPECIES_BASCULEGION_FEMALE] = 1,
[SPECIES_BASCULEGION_FEMALE] = 0,
#endif
[SPECIES_EGG] = 1,
};