Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Can disable follower graphics

Browse Source
This commit is contained in:
Eduardo Quezada 2024-01-24 20:13:07 -03:00
parent f5239aae3c
commit 5119ee2d39
4 changed files with 3173 additions and 523 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/data/graphics/pokemon.h
View File

@ -12,6 +12,9 @@ const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/ico
#if P_FOOTPRINTS
const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp");
#endif //P_FOOTPRINTS
//#if P_FOLLOWERS
const u32 gObjectEventPic_None[] = INCBIN_COMP("graphics/pokemon/porygon/follower.4bpp");
//#endif //P_FOLLOWERS
#if P_FAMILY_BULBASAUR
const u32 gMonFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/anim_front.4bpp.lz");

3682
src/data/object_events/object_event_pic_tables_followers.h
View File

File diff suppressed because it is too large Load Diff

5
src/data/pokemon/species_info.h
View File

@ -229,6 +229,7 @@ const u8 gOgerponCornerstoneMaskPokedexText[] = _(
// Set .compressed = OW_GFX_COMPRESS
#define COMP OW_GFX_COMPRESS
#if P_FOLLOWERS
#define FOLLOWER(name, _size, shadow, _tracks) \
.followerData = { \
.tileTag = TAG_NONE, \
@ -248,6 +249,9 @@ const u8 gOgerponCornerstoneMaskPokedexText[] = _(
.images = sPicTable_##name, \
.affineAnims = gDummySpriteAffineAnimTable, \
},
#else
#define FOLLOWER(name, _size, shadow, _tracks)
#endif
// Maximum value for a female Pokémon is 254 (MON_FEMALE) which is 100% female.
// 255 (MON_GENDERLESS) is reserved for genderless Pokémon.
@ -284,6 +288,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.backAnimId = BACK_ANIM_NONE,
PALETTES(CircledQuestionMark),
ICON(QuestionMark, 0),
.followerData = {TAG_NONE, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, COMP, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_None, gDummySpriteAffineAnimTable},
LEARNSETS(None),
},

6
src/event_object_movement.c
View File

@ -1781,14 +1781,14 @@ static const struct ObjectEventGraphicsInfo * SpeciesToGraphicsInfo(u16 species,
if (OW_GFX_COMPRESS)
{
if (graphicsInfo->tileTag == 0 && species < NUM_SPECIES)
return &gSpeciesInfo[SPECIES_PORYGON].followerData;
return &gSpeciesInfo[SPECIES_NONE].followerData;
else if (graphicsInfo->tileTag != TAG_NONE && species >= NUM_SPECIES)
return &gSpeciesInfo[SPECIES_PORYGON].followerData;
return &gSpeciesInfo[SPECIES_NONE].followerData;
else
return graphicsInfo;
}
else
return graphicsInfo->tileTag == TAG_NONE ? graphicsInfo : &gSpeciesInfo[SPECIES_PORYGON].followerData;
return graphicsInfo->tileTag == TAG_NONE ? graphicsInfo : &gSpeciesInfo[SPECIES_NONE].followerData;
}
// Find, or load, the palette for the specified pokemon info