-
Notifications
You must be signed in to change notification settings - Fork 1k
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.
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
Species Simplifier™ - Part 3 #3562
Species Simplifier™ - Part 3 #3562
Conversation
# Conflicts: # include/pokemon.h
Accidentally had a different title ^^; |
# Conflicts: # src/battle_util.c
It could potentially overwrite items by accident
# Conflicts: # include/pokemon.h
d14bdd1
to
0b98485
Compare
0b98485
to
ede5cc8
Compare
I think the obviously out of scope best solution would be to somehow generate these numbers from the images themselves (it's just a bounding box rounded up to a multiple of 8?), and equip I thought maybe we would have been able to make the macro work like: For reference, here's a sketch of the idea, but note that it doesn't work in this case: struct MonPic {
const u32 *data;
u8 width;
u8 height;
};
#define PIC(id, ...) { .data = gMonFrontPic_##id, __VA_ARGS__ }
// Used as '.frontPic = PIC(Alcremie##sweet, width: 40, height: 56),'
// Where we've defined 'struct MonPic frontPic;' Of course we don't necessarily have to keep Alternatively it's possible to have Non-blocking: I would say that I don't like the look of:
And it would (imo) be nicer if that third line could be |
I think this has been considered and then discarded but I can't remember why, so I'm bringing it up here and somebody can re-explain why it doesn't work 😅 Could we have Although now I write this out, I wonder what |
I think now it's more feasible now than before after the dex text change, so I'd be willing to try :) Though I wouldn't want to do it for this PR. |
# Conflicts: # src/data/pokemon_graphics/back_pic_coordinates.h # src/data/pokemon_graphics/front_pic_coordinates.h
Description
Third part of the PR to make mon easier to add.
gSpeciesInfo
.gSpeciesInfo
.CompressedSpriteSheet
andCompressedSpritePalette
.gSpeciesInfo
viaGetSpeciesLevelUpLearnset
andGetSpeciesTeachableLearnset
.gSpeciesInfo
.gSpeciesInfo
.gSpeciesInfo
.gSpeciesInfo
.gSpeciesInfo
.gSpeciesInfo
to gcc bitflags.gigantamax
bitflag toisGigantamax
.config/species_families.h
toconfig/species_enabled.h
.P_GEN_x_POKEMON
settings to it.gFrontierBannedSpecies
now checks forIsSpeciesEnabled
instead of relying on ifdef blocks.PLACEHOLDER_ANIM_SINGLE_FRAME
.PLACEHOLDER_TWO_FRAME_ANIMATION
toPLACEHOLDER_ANIM_TWO_FRAMES
.ASSUMPTION_FAIL
in tests when used species are disabled.ASSUME(P_GEN_x_POKEMON == TRUE)
have been removed.SPECIES_MINIOR_ORANGE
equates toSPECIES_MINIOR_METEOR_ORANGE
)Missing stuff to be handled in a separate PR:
gSpeciesInfo
as much as it can (it already reduces the amount used as is)struct MonGraphics
that groups graphical data for gender differences..noFlip = FALSE
instancessIssue(s) that this PR closes
Closes #3512
Closes #2738
Closes #3629
Discord contact info
AsparagusEduardo