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

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
805892c
replace launchtemplate with createsprite using fix_launchtemplate.py
Feb 6, 2023
3487a22
tidy up script
Feb 6, 2023
6c1d9df
fix comment handing in fix_launchtemplate.py
Feb 6, 2023
8c408ad
fix double comma after sprite template
Feb 6, 2023
e108e9a
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
Feb 7, 2023
3c3089a
remove py script
Feb 8, 2023
913a459
convert launchtask -> createvisualtask
Feb 8, 2023
f6fd470
merge in upcoming
Feb 8, 2023
f31a824
fix launchtask->createvisualtask issue
Feb 9, 2023
41d05bf
fix ANIM_PAL ORs
Feb 9, 2023
4705fb1
remove launchtemplate, launchtask macros
Feb 9, 2023
29ef785
fix pal macros in z moves
Feb 9, 2023
9eca6e8
fix bloom doom
Feb 9, 2023
3f5a220
add F_PAL_ALL_BUT_DEF
Feb 10, 2023
d316c9d
remove all ANIM_PAL_ usages
Feb 10, 2023
d9bc5ce
devestating drake fix
Feb 10, 2023
b55026b
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
Feb 18, 2023
47db9fb
convert launchsoundtask and setblends
Feb 18, 2023
5d10b98
merge w upcoming
Feb 19, 2023
1d8d4f3
merge w upcoming
Apr 23, 2023
31491eb
Reworked CFRU macro PR
AsparagusEduardo May 27, 2023
c661af5
Merge pull request #22 from AsparagusEduardo/RHH/pr/cleanup/CFRUMacros
ghoulslash May 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 1 addition & 33 deletions asm/macros/battle_anim_script.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,39 +289,7 @@
jumprettrue \ptr
.endm

@ keep CFRU macros cause I'm lazy. todo: update to createsprite and createvisualtask, respectively
.macro launchtemplate launchtemplatePtr launchtemplatePriority launchtemplateArgsNo launchtemplatearg0 launchtemplatearg1 launchtemplatearg2 launchtemplatearg3 launchtemplatearg4 launchtemplatearg5 launchtemplatearg6 launchtemplatearg7 launchtemplatearg8
.byte 0x2
.word \launchtemplatePtr
.byte \launchtemplatePriority
.byte \launchtemplateArgsNo
.hword \launchtemplatearg0
.hword \launchtemplatearg1
.hword \launchtemplatearg2
.hword \launchtemplatearg3
.hword \launchtemplatearg4
.hword \launchtemplatearg5
.hword \launchtemplatearg6
.hword \launchtemplatearg7
.hword \launchtemplatearg8
.endm

.macro launchtask launchtaskPtr launchtaskPriority launchtaskArgsNo launchtaskarg0 launchtaskarg1 launchtaskarg2 launchtaskarg3 launchtaskarg4 launchtaskarg5 launchtaskarg6 launchtaskarg7 launchtaskarg8
.byte 0x3
.word \launchtaskPtr
.byte \launchtaskPriority
.byte \launchtaskArgsNo
.hword \launchtaskarg0
.hword \launchtaskarg1
.hword \launchtaskarg2
.hword \launchtaskarg3
.hword \launchtaskarg4
.hword \launchtaskarg5
.hword \launchtaskarg6
.hword \launchtaskarg7
.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

.byte 0xC
.hword \setblends_value
Expand Down
Loading