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

Replace launchtemplate and launchtask in battle anims #2640

Merged
merged 22 commits into from
May 27, 2023
Merged

Replace launchtemplate and launchtask in battle anims #2640

merged 22 commits into from
May 27, 2023

Conversation

ghoulslash
Copy link
Collaborator

@ghoulslash ghoulslash commented Feb 6, 2023 •
edited
Loading

Adding python script to replace launchtemplate with createsprite. Same with launchtask and createvisualtask

ANIM_PAL uses have also been removed in favor the pret's F_PAL_xx macros

@ghoulslash ghoulslash added the category: move animation Pertains to move animations label Feb 6, 2023
@ghoulslash ghoulslash changed the title replace launchtemplate with createsprite using fix_launchtemplate.py Replace launchtemplate With Createsprite Feb 6, 2023
SBird1337
SBird1337 previously requested changes Feb 8, 2023
View reviewed changes
Copy link
Collaborator

@SBird1337 SBird1337 left a comment

Choose a reason for hiding this comment

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

if the script is a one time thing we should probably not have it in the upstream tree.

@ghoulslash ghoulslash changed the title Replace launchtemplate With Createsprite Replace launchtemplate and launchtask in battle anims Feb 8, 2023
@ghoulslash
Copy link
Collaborator Author

if the script is a one time thing we should probably not have it in the upstream tree.

removed script. also replaced launchtask with createvisualtask and fixed conflicts. ready for review

DizzyEggg
DizzyEggg requested changes Feb 17, 2023
View reviewed changes
asm/macros/battle_anim_script.inc Outdated
.hword \launchtaskarg8
.endm

@ keep CFRU macros cause I'm lazy
.macro setblends setblends_value
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why not get rid of the setblends and launchsoundtask macros as well?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Why not get rid of the setblends and launchsoundtask macros as well?

done

DizzyEggg
DizzyEggg previously approved these changes Feb 19, 2023
View reviewed changes
@AsparagusEduardo AsparagusEduardo self-assigned this May 24, 2023
@AsparagusEduardo AsparagusEduardo dismissed SBird1337’s stale review May 27, 2023 21:29

Script removed as requested.

@AsparagusEduardo AsparagusEduardo merged commit a929ae8 into rh-hideout:upcoming May 27, 2023
@AsparagusEduardo AsparagusEduardo mentioned this pull request May 31, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AsparagusEduardo AsparagusEduardo AsparagusEduardo approved these changes

@DizzyEggg DizzyEggg DizzyEggg left review comments

@SBird1337 SBird1337 Awaiting requested review from SBird1337

Assignees

@AsparagusEduardo AsparagusEduardo

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
@ghoulslash @AsparagusEduardo @SBird1337 @DizzyEggg