Skip to content
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

Legends arceus pokemon expansion #2177

Merged

Conversation

Blackforest92
Copy link

@Blackforest92 Blackforest92 commented Jul 4, 2022

Add Legends Arceus pokemons to the expansion.

  • Missing TM and Tutor moves.
  • Female Basculegion icon seems to not showing.
  • Missing some of battle sprites caused by unavailability.

--- Commit updated in 19-August-2022

  • Add PLA data to src/data/pokemon/form_species_tables.h and src/data/pokemon/form_species_tables_pointers.h
  • Add battle sprites for Kleavor

--- Commit updated in 24-August-2022

  • Add Enamorus data to src/date/pokemon/form_change_table_pointers.h and src/date/pokemon/form_change_tables.h
  • Pull latest master branch and fix merge conflicts

Battle Sprites Credits

Kleavor : leParagon
Ursaluna : KingOfThe-X-Roads (frontsprite) & Asria (backsprite)
Overqwil : KingOfThe-X-Roads (frontsprite) & AxelLoquendo (backsprite)
Growlithe-H : KingOfThe-X-Roads (frontsprite) & Vent (backsprite)
Arcanine-H : GriloKapu
Voltorb-H : leParagon
Electrode-H : KingOfThe-X-Roads (frontsprite) & Vent (backsprite)
Typhlosion-H : KingOfThe-X-Roads (frontsprite) & AxelLoquendo (backsprite)
Qwilfish-H : Frander04
Sneasel-H : Frander04
Lilligant-H : KingOfThe-X-Roads (frontsprite) & AxelLoquendo (backsprite)
Zorua-H : KingOfThe-X-Roads (frontsprite) & Lennybitao (backsprite)
Zoroark-H : KingOfThe-X-Roads (frontsprite) & Lennybitao (backsprite)
Braviary-H : KingOfThe-X-Roads (frontsprite) & AxelLoquendo (backsprite)
Sliggoo-H : KingOfThe-X-Roads (frontsprite) & AxelLoquendo (backsprite)
Goodra-H : KingOfThe-X-Roads (frontsprite) & AxelLoquendo (backsprite)
Avalugg-H : KingOfThe-X-Roads (frontsprite) & AlexandreV2.0 (backsprite)
Basculin White : KingOfThe-X-Roads (frontsprite) & AxelLoquendo (backsprite)
Dialga Origin : KingOfThe-X-Roads (frontsprite) & Vent (backsprite)
Palkia Origin : KingOfThe-X-Roads (frontsprite) & Vent (backsprite)

Copy link
Collaborator

@LOuroboros LOuroboros left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I remembered this PR exists now that I had to bring up the existence of the species form arrays, and now that I'm checking, this PR does not update them.
SPECIES_BASCULIN_WHITE_STRIPPED should be added to sBasculinFormSpeciesIdTable in src/data/pokemon/form_species_tables.h, for example.

@Blackforest92
Copy link
Author

Added PLA data to src/data/pokemon/form_species_tables.h and src/data/pokemon/form_species_tables_pointers.h.

@AsparagusEduardo AsparagusEduardo changed the base branch from pokemon_expansion to master August 24, 2022 04:52
@Blackforest92
Copy link
Author

Blackforest92 commented Aug 24, 2022

Commit has been updated to latest master branch.
All merge conflicts have to do with #if P_NEW_POKEMON == TRUE

Adjust #endif to include new pokemons

and PR #2206

Specifically tidying megas to their respective pokemon

Conflicts presented in :

include/graphics.h
include/constants/species.h
(Adjust #define FORMS_START SPECIES_CALYREX to #define FORMS_START SPECIES_ENAMORUS)
include/constants/pokedex.h
(Adjust #define NATIONAL_DEX_COUNT NATIONAL_DEX_CALYREX to #define NATIONAL_DEX_COUNT NATIONAL_DEX_ENAMORUS)
src/pokemon_icon.c
src/data/pokemon_graphics/front_pic_table.h
src/data/pokemon_graphics/back_pic_table.h
src/data/pokemon_graphics/palette_table.h
src/data/pokemon_graphics/shiny_palette_table.h
src/data/pokemon_graphics/enemy_mon_elevation.h
src/data/pokemon/base_stats.h
src/data/pokemon/pokedex_text.h
src/data/pokemon/pokedex_entries.h
src/data/pokemon/level_up_learnsets.h
src/data/pokemon/form_species_table_pointers.h
src/data/graphics/pokemon.h

@AsparagusEduardo
Copy link
Collaborator

It's very possible that the issue is with the debug menu, as current master has the same issue with other female icons, but not in the party menu or boxes.
image
To confirm that the icon is working, please give yourself a female Basculegion to test.

@Blackforest92
Copy link
Author

Basculegion_F.webm
Tested quickly by adjusting gender ratio to 100% female,

src/data/pokemon/pokedex_text.h Outdated Show resolved Hide resolved
src/data/pokemon/pokedex_text.h Outdated Show resolved Hide resolved
src/data/pokemon/pokedex_text.h Outdated Show resolved Hide resolved
src/data/pokemon/pokedex_text.h Outdated Show resolved Hide resolved
@Blackforest92
Copy link
Author

Done.
Though i can't shake the weird feeling of adding another region names or any region names at all into a pokedex entry.
Its like still using a profile picture of you and your ex together when you are already stop dating.

@AsparagusEduardo
Copy link
Collaborator

Looks good, just needs to resolve the conflict with #2233. I can add the teachable data later.

@Blackforest92
Copy link
Author

Done.

@Blackforest92
Copy link
Author

Did a git reset --hard 61c33f5, pull, then did the changes, then push.

@AsparagusEduardo AsparagusEduardo merged commit 280fd4b into rh-hideout:master Aug 29, 2022
@Blackforest92 Blackforest92 deleted the Legends_Arceus_Expansion branch September 4, 2022 13:13
@AsparagusEduardo AsparagusEduardo mentioned this pull request Oct 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants