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

Moved mon pic tables to gSpeciesInfo + macro cleanup #5597

Merged
merged 8 commits into from
Jan 20, 2025
Merged

Moved mon pic tables to gSpeciesInfo + macro cleanup #5597

merged 8 commits into from
Jan 20, 2025

Conversation

AsparagusEduardo
Copy link
Collaborator

@AsparagusEduardo AsparagusEduardo commented Oct 27, 2024 •
edited
Loading

Migrated overworld pic tables into compound structs in gSpeciesInfo.

Things to note in the release changelog:

  • OVERWORLD now has a required _anims argument, which replaces the need for OVERWORLD_SET_ANIM. For this, sAnimTable_Following was added on every previous use of OVERWORLD.
  • OVERWORLD and OVERWORLD_FEMALE now use a shared OVERWORLD_DATA macro. On top of making it cleaner, it allows female Pokémon to have their own custom animations, like OVERWORLD_SET_ANIM.

Discord contact info

AsparagusEduardo

@AsparagusEduardo AsparagusEduardo marked this pull request as draft October 27, 2024 00:54
@AsparagusEduardo AsparagusEduardo changed the title Renamed folders and symbols to match species defines Cleaned up Overworld mon macros Oct 27, 2024
@AsparagusEduardo AsparagusEduardo changed the title Cleaned up Overworld mon macros Moved mon pic tables to gSpeciesInfo + macro cleanup Oct 27, 2024
@AsparagusEduardo AsparagusEduardo added category: pokemon Pertains to Pokémon data and functionality type: cleanup labels Oct 27, 2024
@AsparagusEduardo AsparagusEduardo added this to the 1.10 milestone Oct 27, 2024
@AsparagusEduardo AsparagusEduardo mentioned this pull request Oct 27, 2024
Open
@AsparagusEduardo AsparagusEduardo force-pushed the _RHH/pr/upcoming/owPicTableInSpeciesInfo branch from 098c9ca to 3dc59b6 Compare October 29, 2024 15:00
@AsparagusEduardo AsparagusEduardo marked this pull request as ready for review October 29, 2024 15:02
@Bassoonian
Copy link
Collaborator

Any chance we could get a migration script for this?

@AsparagusEduardo AsparagusEduardo mentioned this pull request Nov 10, 2024
Closed
20 tasks
@AsparagusEduardo
Copy link
Collaborator Author

Any chance we could get a migration script for this?

#5654

@AlexOn1ine AlexOn1ine removed this from the 1.10 milestone Nov 27, 2024
@AsparagusEduardo
Copy link
Collaborator Author

Solved conflicts

pkmnsnfrn
pkmnsnfrn previously approved these changes Jan 20, 2025
View reviewed changes
Copy link
Collaborator

@pkmnsnfrn pkmnsnfrn left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I tested out the overworld animations for Zubat, Roserade and Ledian's OW follower sprites. Their gender differences looked correct and I didn't notice any issues when running around.

Once the ghost conflict is solved, this can be merged.

@AsparagusEduardo
Copy link
Collaborator Author

Solved conflicts

@pkmnsnfrn pkmnsnfrn merged commit 4825e52 into rh-hideout:upcoming Jan 20, 2025
1 check passed
@AsparagusEduardo AsparagusEduardo deleted the _RHH/pr/upcoming/owPicTableInSpeciesInfo branch January 20, 2025 16:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pkmnsnfrn pkmnsnfrn pkmnsnfrn approved these changes

Assignees

@pkmnsnfrn pkmnsnfrn

Labels
category: pokemon Pertains to Pokémon data and functionality type: cleanup
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@AsparagusEduardo @Bassoonian @pkmnsnfrn @AlexOn1ine