Add species defines for base forms with names #3248
Conversation
# Conflicts: # include/graphics.h # src/data/graphics/pokemon.h # src/pokemon_icon.c # test/battle/form_change/begin_battle.c
# Conflicts: # data/maps/Route119_WeatherInstitute_2F/scripts.inc
AsparagusEduardo
changed the title
# Conflicts: # src/battle_util.c
|
Ready for review. (please squash) |
# Conflicts: # src/battle_ai_main.c
# Conflicts: # src/data/pokemon_graphics/front_pic_anims.h # src/pokemon.c # src/pokemon_animation.c
# Conflicts: # include/constants/species.h # src/battle_setup.c # src/data/pokemon/form_change_table_pointers.h # src/data/pokemon/species_info.h
There was a problem hiding this comment.
This could be worth another PR since it's probably also subjective, but with the base forms including the name of the default form, it feels a bit curious to me that the actual data for the other forms is all the way at the end. I understand species IDs can follow this order, but it'd be a lot more easy to work with if forms were gathered together in all other cases (learnsets, base stats, animations etc).
Already planning on doing this :D (I did it in #2363) |
|
Changes applied. |
|
Fixed modern compile |
There was a problem hiding this comment.
Nice!
I think we should add to the modernFatefulEncounter comment in include/pokemon.h to say that this bit does nothing in Expansion, but that it's kept for save-compatibility and if the developer never used seteventmon/setmonmodernfatefulencounter they can repurpose it.
EDIT: Or alternatively, we could keep modernFatefulEncounter in its entirety and let our users remove it if they want to (i.e. know it's safe to).
... Or leave it for now and we could remove it later when we have save migrations.
Other than that, looks good to go! :)
|
I tried to resolve the conflicts with #3435 🤞 |
Description
Adds species defines for base forms with names. Also updates element names that should refer to those names.
Eg.
SPECIES_MELOETTA->SPECIES_MELOETTA_ARIAand
gMonFrontPic_Meloetta->gMonFrontPic_MeloettaAriaI've been chipping at this for a bit. It's almost done, so I'm opening the PR.
Ported from #2363.
Discord contact info
AsparagusEduardo