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

Heart Swap Move Animation #5460

Merged
merged 18 commits into from
Oct 9, 2024
Merged

Heart Swap Move Animation #5460

merged 18 commits into from
Oct 9, 2024

Conversation

SonikkuA-DatH
Copy link

@SonikkuA-DatH SonikkuA-DatH commented Oct 3, 2024 •
edited
Loading

Partially addresses #5192

Hert7.mp4

Discord contact info

dat.ha, originally Dat.HA#0697

@kittenchilly
Copy link

Looks fine to me overall, but the duplicate skill swap code is kind of annoying. Although it seems to be unavoidable due to the different sprite templates...

@AlexOn1ine AlexOn1ine added the category: move animation Pertains to move animations label Oct 3, 2024
@hedara90
Copy link
Collaborator

hedara90 commented Oct 7, 2024

Finally had time to look at this properly.
The only comment I have about it is that in doubles, the expanding golden ring effect isn't centered on the 'mon using the move.
pokeemerald-10
While in singles it is centered.
pokeemerald-test-0

hedara90
hedara90 reviewed Oct 7, 2024
View reviewed changes
Copy link
Collaborator

@hedara90 hedara90 left a comment

Choose a reason for hiding this comment

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

For all new functions that have inputs, could you make a comment with that each input is?
e.g. AnimTask_HeartSwap takes target as input.

src/battle_anim_psychic.c Outdated Show resolved Hide resolved
@hedara90 hedara90 self-assigned this Oct 7, 2024
@SonikkuA-DatH
Merge branch 'rh-hideout:upcoming' into upcoming
502deff
@SonikkuA-DatH
Update battle_anim_scripts.s
6f43d24 
Removed Thin Ring as it is not a per-mon position sprite
@SonikkuA-DatH
Update battle_anim_psychic.c
e9751c6 
Replaced numbers with proper tags defined in battle_anim.h
hedara90
hedara90 reviewed Oct 9, 2024
View reviewed changes
src/battle_anim_psychic.c Outdated Show resolved Hide resolved
src/battle_anim_psychic.c Outdated Show resolved Hide resolved
@hedara90 hedara90 merged commit 708f642 into rh-hideout:upcoming Oct 9, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hedara90 hedara90 hedara90 approved these changes

Assignees

@hedara90 hedara90

Labels
category: move animation Pertains to move animations
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@SonikkuA-DatH @kittenchilly @hedara90 @AlexOn1ine