Removed the double question mark

This commit is contained in:
Eduardo Quezada 2022-10-24 15:55:13 -03:00
parent 1e4a2c1eb4
commit 77ce81888b
6 changed files with 44 additions and 52 deletions

View file

@ -65,8 +65,7 @@ extern const u32 gOpenPokeballGfx[];
// pokemon gfx
extern const u16 gMonIconPalettes[][16];
extern const u32 gMonFrontPic_CircledQuestionMark[];
extern const u32 gMonFrontPic_DoubleQuestionMark[];
extern const u32 gMonFrontPic_QuestionMark[];
extern const u32 gMonFrontPic_Bulbasaur[];
extern const u32 gMonFrontPic_Ivysaur[];
extern const u32 gMonFrontPic_Venusaur[];
@ -1254,8 +1253,7 @@ extern const u32 gMonFrontPic_Overqwil[];
#endif
extern const u32 gMonFrontPic_Egg[];
extern const u32 gMonBackPic_CircledQuestionMark[];
extern const u32 gMonBackPic_DoubleQuestionMark[];
extern const u32 gMonBackPic_QuestionMark[];
extern const u32 gMonBackPic_Bulbasaur[];
extern const u32 gMonBackPic_Ivysaur[];
extern const u32 gMonBackPic_Venusaur[];
@ -2441,8 +2439,7 @@ extern const u32 gMonBackPic_Overqwil[];
//extern const u32 gMonBackPic_EnamorusTherian[];
#endif
extern const u32 gMonPalette_CircledQuestionMark[];
extern const u32 gMonPalette_DoubleQuestionMark[];
extern const u32 gMonPalette_QuestionMark[];
extern const u32 gMonPalette_Bulbasaur[];
extern const u32 gMonPalette_Ivysaur[];
extern const u32 gMonPalette_Venusaur[];
@ -3651,8 +3648,7 @@ extern const u32 gMonPalette_Overqwil[];
#endif
extern const u32 gMonPalette_Egg[];
extern const u32 gMonShinyPalette_CircledQuestionMark[];
extern const u32 gMonShinyPalette_DoubleQuestionMark[];
extern const u32 gMonShinyPalette_QuestionMark[];
extern const u32 gMonShinyPalette_Bulbasaur[];
extern const u32 gMonShinyPalette_Ivysaur[];
extern const u32 gMonShinyPalette_Venusaur[];

View file

@ -1,11 +1,7 @@
const u32 gMonFrontPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/anim_front.4bpp.lz");
const u32 gMonFrontPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/double/anim_front.4bpp.lz");
const u32 gMonBackPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/back.4bpp.lz");
const u32 gMonBackPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/double/back.4bpp.lz");
const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/normal.gbapal.lz");
const u32 gMonPalette_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/double/normal.gbapal.lz");
const u32 gMonShinyPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/shiny.gbapal.lz");
const u32 gMonShinyPalette_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/double/shiny.gbapal.lz");
const u32 gMonFrontPic_QuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/anim_front.4bpp.lz");
const u32 gMonBackPic_QuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/back.4bpp.lz");
const u32 gMonPalette_QuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/normal.gbapal.lz");
const u32 gMonShinyPalette_QuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/shiny.gbapal.lz");
const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp");
const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp");

View file

@ -1,6 +1,6 @@
const struct CompressedSpriteSheet gMonBackPicTable[] =
{
SPECIES_SPRITE(NONE, gMonBackPic_CircledQuestionMark),
SPECIES_SPRITE(NONE, gMonBackPic_QuestionMark),
SPECIES_SPRITE(BULBASAUR, gMonBackPic_Bulbasaur),
SPECIES_SPRITE(IVYSAUR, gMonBackPic_Ivysaur),
SPECIES_SPRITE(VENUSAUR, gMonBackPic_Venusaur),
@ -677,7 +677,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(OSHAWOTT, gMonBackPic_Oshawott),
SPECIES_SPRITE(DEWOTT, gMonBackPic_Dewott),
SPECIES_SPRITE(SAMUROTT, gMonBackPic_Samurott),
SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_SamurottHisuian),
SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonBackPic_QuestionMark), //gMonBackPic_SamurottHisuian),
SPECIES_SPRITE(PATRAT, gMonBackPic_Patrat),
SPECIES_SPRITE(WATCHOG, gMonBackPic_Watchog),
SPECIES_SPRITE(LILLIPUP, gMonBackPic_Lillipup),
@ -1033,7 +1033,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(ROWLET, gMonBackPic_Rowlet),
SPECIES_SPRITE(DARTRIX, gMonBackPic_Dartrix),
SPECIES_SPRITE(DECIDUEYE, gMonBackPic_Decidueye),
SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_DecidueyeHisuian),
SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonBackPic_QuestionMark), //gMonBackPic_DecidueyeHisuian),
SPECIES_SPRITE(LITTEN, gMonBackPic_Litten),
SPECIES_SPRITE(TORRACAT, gMonBackPic_Torracat),
SPECIES_SPRITE(INCINEROAR, gMonBackPic_Incineroar),
@ -1275,14 +1275,14 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(CALYREX, gMonBackPic_Calyrex),
SPECIES_SPRITE(CALYREX_ICE_RIDER, gMonBackPic_CalyrexIceRider),
SPECIES_SPRITE(CALYREX_SHADOW_RIDER, gMonBackPic_CalyrexShadowRider),
SPECIES_SPRITE(WYRDEER, gMonBackPic_CircledQuestionMark), //gMonBackPic_Wyrdeer),
SPECIES_SPRITE(WYRDEER, gMonBackPic_QuestionMark), //gMonBackPic_Wyrdeer),
SPECIES_SPRITE(KLEAVOR, gMonBackPic_Kleavor),
SPECIES_SPRITE(URSALUNA, gMonBackPic_Ursaluna),
SPECIES_SPRITE(BASCULEGION, gMonBackPic_CircledQuestionMark), //gMonBackPic_Basculegion),
SPECIES_SPRITE(SNEASLER, gMonBackPic_CircledQuestionMark), //gMonBackPic_Sneasler),
SPECIES_SPRITE(BASCULEGION, gMonBackPic_QuestionMark), //gMonBackPic_Basculegion),
SPECIES_SPRITE(SNEASLER, gMonBackPic_QuestionMark), //gMonBackPic_Sneasler),
SPECIES_SPRITE(OVERQWIL, gMonBackPic_Overqwil),
SPECIES_SPRITE(ENAMORUS, gMonBackPic_CircledQuestionMark), //gMonBackPic_Enamorus),
SPECIES_SPRITE(ENAMORUS_THERIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_EnamorusTherian),
SPECIES_SPRITE(ENAMORUS, gMonBackPic_QuestionMark), //gMonBackPic_Enamorus),
SPECIES_SPRITE(ENAMORUS_THERIAN, gMonBackPic_QuestionMark), //gMonBackPic_EnamorusTherian),
#endif
SPECIES_SPRITE(EGG, gMonFrontPic_Egg),
};
@ -1311,6 +1311,6 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[] =
SPECIES_SPRITE(PYROAR, gMonBackPic_PyroarF),
#endif
#if P_GEN_8_POKEMON == TRUE
SPECIES_SPRITE(BASCULEGION, gMonBackPic_CircledQuestionMark), //gMonBackPic_BasculegionF),
SPECIES_SPRITE(BASCULEGION, gMonBackPic_QuestionMark), //gMonBackPic_BasculegionF),
#endif
};

View file

@ -1,6 +1,6 @@
const struct CompressedSpriteSheet gMonFrontPicTable[] =
{
SPECIES_SPRITE(NONE, gMonFrontPic_CircledQuestionMark),
SPECIES_SPRITE(NONE, gMonFrontPic_QuestionMark),
SPECIES_SPRITE(BULBASAUR, gMonFrontPic_Bulbasaur),
SPECIES_SPRITE(IVYSAUR, gMonFrontPic_Ivysaur),
SPECIES_SPRITE(VENUSAUR, gMonFrontPic_Venusaur),
@ -677,7 +677,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(OSHAWOTT, gMonFrontPic_Oshawott),
SPECIES_SPRITE(DEWOTT, gMonFrontPic_Dewott),
SPECIES_SPRITE(SAMUROTT, gMonFrontPic_Samurott),
SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_SamurottHisuian),
SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonFrontPic_QuestionMark), //gMonFrontPic_SamurottHisuian),
SPECIES_SPRITE(PATRAT, gMonFrontPic_Patrat),
SPECIES_SPRITE(WATCHOG, gMonFrontPic_Watchog),
SPECIES_SPRITE(LILLIPUP, gMonFrontPic_Lillipup),
@ -1033,7 +1033,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(ROWLET, gMonFrontPic_Rowlet),
SPECIES_SPRITE(DARTRIX, gMonFrontPic_Dartrix),
SPECIES_SPRITE(DECIDUEYE, gMonFrontPic_Decidueye),
SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_DecidueyeHisuian),
SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonFrontPic_QuestionMark), //gMonFrontPic_DecidueyeHisuian),
SPECIES_SPRITE(LITTEN, gMonFrontPic_Litten),
SPECIES_SPRITE(TORRACAT, gMonFrontPic_Torracat),
SPECIES_SPRITE(INCINEROAR, gMonFrontPic_Incineroar),
@ -1275,14 +1275,14 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(CALYREX, gMonFrontPic_Calyrex),
SPECIES_SPRITE(CALYREX_ICE_RIDER, gMonFrontPic_CalyrexIceRider),
SPECIES_SPRITE(CALYREX_SHADOW_RIDER, gMonFrontPic_CalyrexShadowRider),
SPECIES_SPRITE(WYRDEER, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Wyrdeer),
SPECIES_SPRITE(WYRDEER, gMonFrontPic_QuestionMark), //gMonFrontPic_Wyrdeer),
SPECIES_SPRITE(KLEAVOR, gMonFrontPic_Kleavor),
SPECIES_SPRITE(URSALUNA, gMonFrontPic_Ursaluna),
SPECIES_SPRITE(BASCULEGION, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Basculegion),
SPECIES_SPRITE(SNEASLER, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Sneasler),
SPECIES_SPRITE(BASCULEGION, gMonFrontPic_QuestionMark), //gMonFrontPic_Basculegion),
SPECIES_SPRITE(SNEASLER, gMonFrontPic_QuestionMark), //gMonFrontPic_Sneasler),
SPECIES_SPRITE(OVERQWIL, gMonFrontPic_Overqwil),
SPECIES_SPRITE(ENAMORUS, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Enamorus),
SPECIES_SPRITE(ENAMORUS_THERIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_EnamorusTherian),
SPECIES_SPRITE(ENAMORUS, gMonFrontPic_QuestionMark), //gMonFrontPic_Enamorus),
SPECIES_SPRITE(ENAMORUS_THERIAN, gMonFrontPic_QuestionMark), //gMonFrontPic_EnamorusTherian),
#endif
SPECIES_SPRITE(EGG, gMonFrontPic_Egg),
};
@ -1311,6 +1311,6 @@ const struct CompressedSpriteSheet gMonFrontPicTableFemale[] =
SPECIES_SPRITE(PYROAR, gMonFrontPic_PyroarF),
#endif
#if P_GEN_7_POKEMON == TRUE
SPECIES_SPRITE(BASCULEGION, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_BasculegionF),
SPECIES_SPRITE(BASCULEGION, gMonFrontPic_QuestionMark), //gMonFrontPic_BasculegionF),
#endif
};

View file

@ -1,6 +1,6 @@
const struct CompressedSpritePalette gMonPaletteTable[] =
{
SPECIES_PAL(NONE, gMonPalette_CircledQuestionMark),
SPECIES_PAL(NONE, gMonPalette_QuestionMark),
SPECIES_PAL(BULBASAUR, gMonPalette_Bulbasaur),
SPECIES_PAL(IVYSAUR, gMonPalette_Ivysaur),
SPECIES_PAL(VENUSAUR, gMonPalette_Venusaur),
@ -677,7 +677,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(OSHAWOTT, gMonPalette_Oshawott),
SPECIES_PAL(DEWOTT, gMonPalette_Dewott),
SPECIES_PAL(SAMUROTT, gMonPalette_Samurott),
SPECIES_PAL(SAMUROTT_HISUIAN, gMonPalette_CircledQuestionMark), //gMonPalette_SamurottHisuian),
SPECIES_PAL(SAMUROTT_HISUIAN, gMonPalette_QuestionMark), //gMonPalette_SamurottHisuian),
SPECIES_PAL(PATRAT, gMonPalette_Patrat),
SPECIES_PAL(WATCHOG, gMonPalette_Watchog),
SPECIES_PAL(LILLIPUP, gMonPalette_Lillipup),
@ -1033,7 +1033,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(ROWLET, gMonPalette_Rowlet),
SPECIES_PAL(DARTRIX, gMonPalette_Dartrix),
SPECIES_PAL(DECIDUEYE, gMonPalette_Decidueye),
SPECIES_PAL(DECIDUEYE_HISUIAN, gMonPalette_CircledQuestionMark), //gMonPalette_DecidueyeHisuian),
SPECIES_PAL(DECIDUEYE_HISUIAN, gMonPalette_QuestionMark), //gMonPalette_DecidueyeHisuian),
SPECIES_PAL(LITTEN, gMonPalette_Litten),
SPECIES_PAL(TORRACAT, gMonPalette_Torracat),
SPECIES_PAL(INCINEROAR, gMonPalette_Incineroar),
@ -1275,14 +1275,14 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(CALYREX, gMonPalette_Calyrex),
SPECIES_PAL(CALYREX_ICE_RIDER, gMonPalette_CalyrexIceRider),
SPECIES_PAL(CALYREX_SHADOW_RIDER, gMonPalette_CalyrexShadowRider),
SPECIES_PAL(WYRDEER, gMonPalette_CircledQuestionMark), //gMonPalette_Wyrdeer),
SPECIES_PAL(WYRDEER, gMonPalette_QuestionMark), //gMonPalette_Wyrdeer),
SPECIES_PAL(KLEAVOR, gMonPalette_Kleavor),
SPECIES_PAL(URSALUNA, gMonPalette_Ursaluna),
SPECIES_PAL(BASCULEGION, gMonPalette_CircledQuestionMark), //gMonPalette_Basculegion),
SPECIES_PAL(SNEASLER, gMonPalette_CircledQuestionMark), //gMonPalette_Sneasler),
SPECIES_PAL(BASCULEGION, gMonPalette_QuestionMark), //gMonPalette_Basculegion),
SPECIES_PAL(SNEASLER, gMonPalette_QuestionMark), //gMonPalette_Sneasler),
SPECIES_PAL(OVERQWIL, gMonPalette_Overqwil),
SPECIES_PAL(ENAMORUS, gMonPalette_CircledQuestionMark), //gMonPalette_Enamorus),
SPECIES_PAL(ENAMORUS_THERIAN, gMonPalette_CircledQuestionMark), //gMonPalette_EnamorusTherian),
SPECIES_PAL(ENAMORUS, gMonPalette_QuestionMark), //gMonPalette_Enamorus),
SPECIES_PAL(ENAMORUS_THERIAN, gMonPalette_QuestionMark), //gMonPalette_EnamorusTherian),
#endif
SPECIES_PAL(EGG, gMonPalette_Egg),
};
@ -1311,6 +1311,6 @@ const struct CompressedSpritePalette gMonPaletteTableFemale[] =
SPECIES_PAL(PYROAR, gMonPalette_Pyroar),
#endif
#if P_GEN_8_POKEMON == TRUE
SPECIES_PAL(BASCULEGION, gMonPalette_CircledQuestionMark), // gMonPalette_BasculegionF),
SPECIES_PAL(BASCULEGION, gMonPalette_QuestionMark), // gMonPalette_BasculegionF),
#endif
};

View file

@ -1,6 +1,6 @@
const struct CompressedSpritePalette gMonShinyPaletteTable[] =
{
SPECIES_SHINY_PAL(NONE, gMonShinyPalette_CircledQuestionMark),
SPECIES_SHINY_PAL(NONE, gMonShinyPalette_QuestionMark),
SPECIES_SHINY_PAL(BULBASAUR, gMonShinyPalette_Bulbasaur),
SPECIES_SHINY_PAL(IVYSAUR, gMonShinyPalette_Ivysaur),
SPECIES_SHINY_PAL(VENUSAUR, gMonShinyPalette_Venusaur),
@ -677,7 +677,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(OSHAWOTT, gMonShinyPalette_Oshawott),
SPECIES_SHINY_PAL(DEWOTT, gMonShinyPalette_Dewott),
SPECIES_SHINY_PAL(SAMUROTT, gMonShinyPalette_Samurott),
SPECIES_SHINY_PAL(SAMUROTT_HISUIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_SamurottHisuian),
SPECIES_SHINY_PAL(SAMUROTT_HISUIAN, gMonShinyPalette_QuestionMark), //gMonShinyPalette_SamurottHisuian),
SPECIES_SHINY_PAL(PATRAT, gMonShinyPalette_Patrat),
SPECIES_SHINY_PAL(WATCHOG, gMonShinyPalette_Watchog),
SPECIES_SHINY_PAL(LILLIPUP, gMonShinyPalette_Lillipup),
@ -1033,7 +1033,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(ROWLET, gMonShinyPalette_Rowlet),
SPECIES_SHINY_PAL(DARTRIX, gMonShinyPalette_Dartrix),
SPECIES_SHINY_PAL(DECIDUEYE, gMonShinyPalette_Decidueye),
SPECIES_SHINY_PAL(DECIDUEYE_HISUIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_DecidueyeHisuian),
SPECIES_SHINY_PAL(DECIDUEYE_HISUIAN, gMonShinyPalette_QuestionMark), //gMonShinyPalette_DecidueyeHisuian),
SPECIES_SHINY_PAL(LITTEN, gMonShinyPalette_Litten),
SPECIES_SHINY_PAL(TORRACAT, gMonShinyPalette_Torracat),
SPECIES_SHINY_PAL(INCINEROAR, gMonShinyPalette_Incineroar),
@ -1275,14 +1275,14 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(CALYREX, gMonShinyPalette_Calyrex),
SPECIES_SHINY_PAL(CALYREX_ICE_RIDER, gMonShinyPalette_CalyrexIceRider),
SPECIES_SHINY_PAL(CALYREX_SHADOW_RIDER, gMonShinyPalette_CalyrexShadowRider),
SPECIES_SHINY_PAL(WYRDEER, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_Wyrdeer),
SPECIES_SHINY_PAL(WYRDEER, gMonShinyPalette_QuestionMark), //gMonShinyPalette_Wyrdeer),
SPECIES_SHINY_PAL(KLEAVOR, gMonShinyPalette_Kleavor),
SPECIES_SHINY_PAL(URSALUNA, gMonShinyPalette_Ursaluna),
SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_Basculegion),
SPECIES_SHINY_PAL(SNEASLER, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_Sneasler),
SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_QuestionMark), //gMonShinyPalette_Basculegion),
SPECIES_SHINY_PAL(SNEASLER, gMonShinyPalette_QuestionMark), //gMonShinyPalette_Sneasler),
SPECIES_SHINY_PAL(OVERQWIL, gMonShinyPalette_Overqwil),
SPECIES_SHINY_PAL(ENAMORUS, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_Enamorus),
SPECIES_SHINY_PAL(ENAMORUS_THERIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_EnamorusTherian),
SPECIES_SHINY_PAL(ENAMORUS, gMonShinyPalette_QuestionMark), //gMonShinyPalette_Enamorus),
SPECIES_SHINY_PAL(ENAMORUS_THERIAN, gMonShinyPalette_QuestionMark), //gMonShinyPalette_EnamorusTherian),
#endif
SPECIES_SHINY_PAL(EGG, gMonPalette_Egg),
};
@ -1311,6 +1311,6 @@ const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] =
SPECIES_SHINY_PAL(PYROAR, gMonShinyPalette_Pyroar),
#endif
#if P_GEN_8_POKEMON == TRUE
SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_BasculegionF),
SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_QuestionMark), // gMonShinyPalette_BasculegionF),
#endif
};