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

Moved follower settings to overworld config

Browse Source
This commit is contained in:
Eduardo Quezada 2024-02-18 00:16:59 -03:00
parent f350000b44
commit 1a4bc69c5a
7 changed files with 2632 additions and 2651 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/config/overworld.h
View File

@ -31,6 +31,16 @@
#define OW_BERRY_YIELD_RATE GEN_3 // Presets for how many Berries each plant can yield.
#define OW_BERRY_DRAIN_RATE GEN_6_ORAS // If OW_BERRY_MOISTURE is enabled, this setting changes how fast the soil dries out. GEN_4 uses a Berry-dependent drain rate, GEN_6_XY dries out in 24 hours (4 hours with the relevant Mulch) and GEN_6_ORAS dries out in 4 hours. Other values are illegal.
// Follower Pokémon
#define OW_FOLLOWERS_ENABLED TRUE // Enables follower Pokémon, HGSS style.
#define OW_MON_BOBBING TRUE // If true, follower pokemon will bob up and down during their idle & walking animations
#define LARGE_OW_SUPPORT TRUE // If true, adds a small amount of overhead to OW code so that large (48x48, 64x64) OWs will display correctly under bridges, etc.
#define OW_MON_POKEBALLS TRUE // Followers will emerge from the pokeball they are stored in, instead of a normal pokeball
#define OW_GFX_COMPRESS TRUE // Adds support for compressed OW graphics, (Also compresses pokemon follower graphics).
// Compressed gfx are incompatible with non-power-of-two sprite sizes:
// (You should not use 48x48 sprites/tables for compressed gfx)
// 16x32, 32x32, 64x64 etc are fine
// Out-of-battle Ability effects
#define OW_SYNCHRONIZE_NATURE GEN_LATEST // In Gen8, if a Pokémon with Synchronize is leading the party, it's 100% guaranteed that wild Pokémon will have the same Nature, as opposed to 50% previously. Stationary Pokémon are excluded in Gen3. In Gen6, all No Eggs Discovered gift Pokémon will have the same Nature, while in Gen7 all gift Pokémon will, regardless of Egg Group - In Gen 8, no gift Pokémon are affected. In Gen9, this ability has no out-of-battle effect.
#define OW_COMPOUND_EYES GEN_LATEST // Prior to Gen9, if a Pokémon with Compound Eyes is leading the party, the wild held item rate is increased to 60%/20%.

1
include/config/pokemon.h
View File

@ -40,7 +40,6 @@
// Other settings
#define P_CUSTOM_GENDER_DIFF_ICONS TRUE // If TRUE, will give more Pokémon custom icons for their female forms, i.e. Hippopotas and Hippowdon
#define P_FOOTPRINTS TRUE // If TRUE, Pokémon will have footprints (as was the case up to Gen 5 and in BDSP). Disabling this saves some ROM space.
#define P_FOLLOWERS TRUE // PLACEHOLDER_DESCRIPTION
#define P_LEGENDARY_PERFECT_IVS GEN_LATEST // Since Gen 6, Legendaries, Mythicals and Ultra Beasts found in the wild or given through gifts have at least 3 perfect IVs.
#define P_EV_CAP GEN_LATEST // Since Gen 6, the max EVs per stat is 252 instead of 255.
#define P_SHOW_TERA_TYPE GEN_LATEST // Since Gen 9, the Tera Type is shown on the summary screen.

20
include/constants/event_objects.h
View File

@ -286,26 +286,6 @@
#define OW_SPECIES(x) (((x)->graphicsId & OBJ_EVENT_GFX_SPECIES_MASK) - OBJ_EVENT_GFX_MON_BASE)
#define OW_FORM(x) ((x)->graphicsId >> OBJ_EVENT_GFX_SPECIES_BITS)
#define OW_FOLLOWERS_ENABLED FALSE
// If true, follower pokemon will bob up and down
// during their idle & walking animations
#define OW_MON_BOBBING TRUE
// If true, adds a small amount of overhead
// to OW code so that large (48x48, 64x64) OWs
// will display correctly under bridges, etc.
#define LARGE_OW_SUPPORT TRUE
// See global.h for the toggle of OW_GFX_COMPRESS
// Compressed gfx are incompatible with non-power-of-two sprite sizes:
// (You should not use 48x48 sprites/tables for compressed gfx)
// 16x32, 32x32, 64x64 etc are fine
// Followers will emerge from the pokeball they are stored in,
// instead of a normal pokeball
#define OW_MON_POKEBALLS TRUE
#define SHADOW_SIZE_S 0
#define SHADOW_SIZE_M 1
#define SHADOW_SIZE_L 2

4
include/global.h
View File

@ -1097,8 +1097,4 @@ struct MapPosition
extern u8 gStackBase[]; // Start of stack-allocated IWRAM
// Adds support for compressed OW graphics,
// (Also compresses pokemon follower graphics)
#define OW_GFX_COMPRESS TRUE
#endif // GUARD_GLOBAL_H

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

File diff suppressed because it is too large Load Diff

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

@ -1,8 +1,8 @@
#if P_FOLLOWERS
static const struct SpriteFrameImage sPicTable_Substitute[] = {
overworld_ascending_frames(gObjectEventPic_Substitute, 4, 4),
};
#if OW_FOLLOWERS_ENABLED
#if P_FAMILY_BULBASAUR
static const struct SpriteFrameImage sPicTable_Bulbasaur[] = {
overworld_ascending_frames(gObjectEventPic_Bulbasaur, 4, 4),
@ -6147,4 +6147,4 @@ static const struct SpriteFrameImage sPicTable_TerapagosStellar[] = {
};*/
#endif //P_FAMILY_PECHARUNT
#endif //P_FOLLOWERS
#endif //OW_FOLLOWERS_ENABLED

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

@ -229,7 +229,7 @@ const u8 gOgerponCornerstoneMaskPokedexText[] = _(
// Set .compressed = OW_GFX_COMPRESS
#define COMP OW_GFX_COMPRESS
#if P_FOLLOWERS
#if OW_FOLLOWERS_ENABLED
#define FOLLOWER(name, _size, shadow, _tracks) \
.followerData = { \
.tileTag = TAG_NONE, \
@ -381,8 +381,6 @@ const struct SpeciesInfo gSpeciesInfo[] =
*/
};
// Standalone follower palettes
// If not NULL, entries here override the front-sprite-based pals
// used by OBJ_EVENT_PAL_TAG_DYNAMIC