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.

Sign up for GitHub

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

Jump to bottom

Species Refactor #2363

Closed
wants to merge 298 commits into from
Closed

Species Refactor #2363

wants to merge 298 commits into from

Conversation

AsparagusEduardo
Copy link
Collaborator

@AsparagusEduardo AsparagusEduardo commented Sep 27, 2022 •
edited
Loading

Due to the sheer size of this PR, I decided to slowly port features from it into their own individuals PRs (plus the help of other people):

Description

  • Reordered IDs by game release.
  • Tables ordered by base species.
  • Add data:
    • Teachable moves from future generations
    • Species data
  • Removed #if defined SPECIES_ instances.
  • Created new macros for gSpeciesInfo and grouped them all next to the cases used.
  • Pokédex Upgrades
    • Simplify the creation of National and Regional Dexes by having to modify only 2 lists and having them auto-update based what species are disabled.
    • Automatically use 4 digits when the Dex count exceeds 999.
    • Add form dex data (Fixes Alternate forms don't have heights and weights specifict to them. #2738).
    • Change form entry by pressing L or R in the scrolling list menu
    • Tracking caught and seen specific forms.
    • Configs
      • Config to not show form entry info unless they're actually caught.
      • Config to search mon by single letter instead of groups of 3 letters.
      • Config to skip multiple dex entries (like in SV).
      • Config to have an empty entry at the end of the dex list when there's an unseen mon ahead (like in SV)
      • Config to have the regional dex have a N°000 entry like in Gen 5
  • Config for toggling categories of species (Regional Forms, Mega Evolutions, Gigantamax, future gen evolutions)
  • Restore pret mon graphic order
  • Separate cries from species order into their own IDs to simplify adding newer species
  • Remove Unown hack.
  • Reduce space by storing mon pic tables as u32 *const instead of CompressedSpriteSheet
  • Group national dex data (like names and form tables) into their own table.
  • Rename Mega Pokémon voice samples from mega_x.aif to x_mega.aif for consistency.
  • Learnsets
    • Learnsets pointers stored in gSpeciesInfo.
    • Order Egg Moves by alphabetical order.
    • Order Teachable Moves by alphabetical order.
  • Evolution table converted to individual tables to both reduce size and allow for over 10 evolutions (Milcery -> Alcremie)
  • Extended Easy Chat integration (fixes Give support for EASY CHAT #2567)

Discord contact info

AsparagusEduardo#6051

@AsparagusEduardo AsparagusEduardo added category: pokemon Pertains to Pokémon data and functionality type: BREAKING Not to be merged lightly, needs to be reviewed labels Sep 30, 2022
@AsparagusEduardo
Removed event moves from Smeargle
5c974b9
@AsparagusEduardo
Reordered gen 3 TeachableLearnsets
8ca0c59
@AsparagusEduardo
Reordered gen 4 TeachableLearnsets
b33ceee
@AsparagusEduardo
Reordered gen 5 TeachableLearnsets
d9bae8e
@AsparagusEduardo
Reordered gen 6 TeachableLearnsets
52c87be
@AsparagusEduardo
Reordered gen 7 TeachableLearnsets
325c38b
@AsparagusEduardo
Reordered gen 8 TeachableLearnsets
6a224e3
@AsparagusEduardo
Merged pallete conversion
fe10764 
# Conflicts:
#	include/constants/pokemon_config.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/pokemon_icon.c
@AsparagusEduardo
merging in mon animations PR
70907fa 
# Conflicts:
#	src/data/pokemon_graphics/front_pic_anims.h
#	src/pokemon.c
@AsparagusEduardo
Ordered Gen 1 egg moves
b160bd9
@AsparagusEduardo
Fixed compiling when disabling species
ed2f69d
@AsparagusEduardo
Ordered form cries
7fd9126
@AsparagusEduardo
Ordered Gen 2 egg moves
4407437
@AsparagusEduardo
Ordered Gen 3 egg moves
dfe2ea3
@AsparagusEduardo
Ordered Gen 4 egg moves
8e7fa20
@AsparagusEduardo
Ordered Gen 5 egg moves
167889c
@AsparagusEduardo
Ordered Gen 6 egg moves
38ef41a
@AsparagusEduardo
Ordered Gen 7 egg moves
7d7c092
@AsparagusEduardo
Revert "Restored mon icon tables"
f4b96f9 
This reverts commit c528200.

# Conflicts:
#	include/pokemon_icon.h
#	src/data/pokemon/species_info.h
#	src/pokemon_icon.c
@AsparagusEduardo
Revert "Restored gMonFrontAnimsPtrTable"
3c35152 
This reverts commit 33f1df4.

# Conflicts:
#	src/data/pokemon/species_info.h
#	src/data/pokemon_graphics/front_pic_anims.h
@AsparagusEduardo
Revert "Restored gMonFrontPicCoords and gMonBackPicCoords"
36fd403 
This reverts commit f65de53.

# Conflicts:
#	src/data/pokemon/species_info.h
#	src/data/pokemon_graphics/back_pic_coordinates.h
#	src/data/pokemon_graphics/front_pic_coordinates.h
#	src/trade.c
@AsparagusEduardo
Revert "Restored gEnemyMonElevation"
8a3f924 
This reverts commit 84e6ee2.

# Conflicts:
#	src/data/pokemon_graphics/enemy_mon_elevation.h
@AsparagusEduardo
Revert "Restored gMonShinyPaletteTable"
1073b5d 
This reverts commit ecd2291.

# Conflicts:
#	src/data/pokemon_graphics/shiny_palette_table.h
@AsparagusEduardo
Revert "Restored gMonPaletteTable"
474f632 
This reverts commit bef27c1.

# Conflicts:
#	src/data/pokemon/species_info.h
#	src/data/pokemon_graphics/palette_table.h
@AsparagusEduardo
Revert "Restored gMonBackPicTable"
1c3ecf2 
This reverts commit 7b9bafa.

# Conflicts:
#	src/data/pokemon/species_info.h
#	src/data/pokemon_graphics/back_pic_table.h
@AsparagusEduardo
Revert "Restored gMonFrontPicTable"
f0e0b1d 
This reverts commit 15aa139.

# Conflicts:
#	src/data/pokemon/species_info.h
#	src/data/pokemon_graphics/front_pic_table.h
@AsparagusEduardo
Placeholder info while I move data to gSpeciesInfo
0250133
@AsparagusEduardo
Revert "Restored usage of gMonIconTable to keep consistent with the P…
09d6a10 
…oryMap compatibility"

This reverts commit eb907c8.

# Conflicts:
#	src/data/pokemon/species_info.h
#	src/pokemon_icon.c
@AsparagusEduardo
Moved Evolutions to gSpeciesInfo
98fca49
@AsparagusEduardo
Fixed Paldean Wooper data
27b7eda
@AsparagusEduardo
Fixed Galarian Stunfisk friendship
f15c350
@AsparagusEduardo
Improved Pumpkaboo/Gourgeist macros
435c6c7
@AsparagusEduardo
Missing icons
c36a68a
@AsparagusEduardo
Misc macro cleanup
ddc513c
@AsparagusEduardo
Removed unused "2nd animations"
6456522
@AsparagusEduardo
Merge branch 'RHH/upcoming' into RHH/pr/breaking/speciesReorder
647ca74 
# Conflicts:
#	gflib/string_util.c
#	graphics/pokemon/alcremie/lemon_cream/back.png
#	graphics/pokemon/alcremie/lemon_cream/front.png
#	graphics/pokemon/alcremie/matcha_cream/back.png
#	graphics/pokemon/alcremie/matcha_cream/front.png
#	graphics/pokemon/alcremie/mint_cream/back.png
#	graphics/pokemon/alcremie/mint_cream/front.png
#	graphics/pokemon/alcremie/ruby_cream/back.png
#	graphics/pokemon/alcremie/ruby_cream/front.png
#	graphics/pokemon/alcremie/ruby_swirl/back.png
#	graphics/pokemon/alcremie/ruby_swirl/front.png
#	graphics/pokemon/alcremie/salted_cream/back.png
#	graphics/pokemon/alcremie/salted_cream/front.png
#	graphics/pokemon/arcanine/hisuian/back.png
#	graphics/pokemon/arcanine/hisuian/front.png
#	graphics/pokemon/avalugg/hisuian/back.png
#	graphics/pokemon/avalugg/hisuian/front.png
#	graphics/pokemon/basculegion/back.png
#	graphics/pokemon/basculegion/female/back.png
#	graphics/pokemon/basculegion/female/front.png
#	graphics/pokemon/basculegion/front.png
#	graphics/pokemon/enamorus/front.png
#	graphics/pokemon/goodra/hisuian/back.png
#	graphics/pokemon/goodra/hisuian/front.png
#	graphics/pokemon/growlithe/hisuian/back.png
#	graphics/pokemon/growlithe/hisuian/front.png
#	graphics/pokemon/qwilfish/hisuian/back.png
#	graphics/pokemon/qwilfish/hisuian/front.png
#	graphics/pokemon/samurott/hisuian/back.png
#	graphics/pokemon/sliggoo/hisuian/back.png
#	graphics/pokemon/sliggoo/hisuian/front.png
#	graphics/pokemon/sneasel/hisuian/back.png
#	graphics/pokemon/sneasel/hisuian/front.png
#	include/union_room_chat.h
#	src/data/pokemon/evolution.h
#	src/pokemon.c
#	src/union_room_chat.c
#	test/form_change.c
#	test/test_runner_battle.c
@AsparagusEduardo
Fixed addresses
cebc48d
@AsparagusEduardo
Removed ifdefs from commented icon table
ad8a79a
@AsparagusEduardo AsparagusEduardo mentioned this pull request Jul 7, 2023
Merged
@AsparagusEduardo AsparagusEduardo marked this pull request as ready for review August 14, 2023 03:28
@AsparagusEduardo AsparagusEduardo marked this pull request as draft August 14, 2023 03:28
@AsparagusEduardo
Copy link
Collaborator Author

This PR is a mess. Keeping this open for so long has given people the impression that it's in a usable state, when it isn't.

@AsparagusEduardo AsparagusEduardo changed the title [For 2.0][WIP] Species Refactor ™️ Species Refactor Aug 15, 2023
@AsparagusEduardo AsparagusEduardo mentioned this pull request Aug 22, 2023
Merged
@leo60228 leo60228 mentioned this pull request Aug 22, 2023
Merged
8 tasks
This was referenced Jan 11, 2024
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
category: pokemon Pertains to Pokémon data and functionality type: BREAKING Not to be merged lightly, needs to be reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Alternate forms don't have heights and weights specifict to them.
4 participants
@AsparagusEduardo @Jaizu @Bassoonian @AlexOn1ine