Oh, very nice! Still, I'm glad I figured it out on my own, for a confidence boost if nothing else! Is the fact that step 9 of your guide isn't working for me a problem or is it an out of date step? Neither the src/data/pokemon/evolution.h nor the src/data/pokemon/base_stats.h file have /* or */ seemingly anywhere in the file, so there's nothing to find / replace.
Thanks for all your help, both in writing the guide and keeping up with the topic! I'm sure in doing so you are enabling a lot of new hacks to get developed!
Ah, I guess I should update those sections.
When RHH took over the development for the feature branches, AsparagusEduardo came up with this handy idea of having preprocessor directives to define the existence of each feature branch, so when a project has all 3 of them they all play their part normally without having the user uncomment stuff to make things work.
It's been a while now, but this treatment was given to certain files, like for example the
base_stats.h
file of the pokemon_expansion branch, where every ability introduced in Gen. 4 is only being used if the BATTLE_ENGINE directive is present and every item introduced in the same time frame is only used if the ITEM_EXPANSION directive is present.
Recently, SBird applied the same idea to the
evolutions.h
file, defining each item the PE makes use of for an evolution in the branch's
pokemon_config.h
file, if the
ITEM_EXPANSION
directive is not present.
Coupled with the fact that all the moves from the BE are already defined there for compatibility reasons, everything was safely uncommented in the
evolution.h
.
Thank you for bringing this up. I will update the main post right away.
EDIT: Done. I got rid of the former 9th step, and I also included the merge conflict in
src/data/pokemon/egg_moves.h
too.