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.

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

Labeled framesets and related constants #1063

Merged
merged 6 commits into from
Aug 22, 2023

Conversation

SoupPotato
Copy link
Contributor

Updated all Framesets with labels.

Copy link
Collaborator

@vulcandth vulcandth left a comment

Choose a reason for hiding this comment

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

Great work! Some feedback for now. I'll review it more when I get back home later.

data/battle_anims/framesets.asm Outdated Show resolved Hide resolved
data/battle_anims/objects.asm Outdated Show resolved Hide resolved
data/battle_anims/objects.asm Show resolved Hide resolved
Copy link
Collaborator

@vulcandth vulcandth left a comment

Choose a reason for hiding this comment

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

Alright; this looks good to me. I'm going to let either @mid-kid or @Rangi42 review first before merging to pokecrystal and pokegold.

@mid-kid
Copy link
Member

mid-kid commented Aug 14, 2023

Just gonna comment that I like the naming scheme :)
So if I don't get around to properly reviewing this in the next week, consider this an approval.

@Rangi42 Rangi42 changed the title Labeled Framesets and Constants Related Labeled framesets and related constants Aug 15, 2023
@vulcandth
Copy link
Collaborator

Once I work out the conflicts when merging this to pokegold; i'll merge this.

@vulcandth vulcandth merged commit 6180be3 into pret:master Aug 22, 2023
1 check passed
github-actions bot pushed a commit that referenced this pull request Aug 22, 2023
* Labeled Framesets and Constants Related

* Feedback Implemented with PascalCase and Constant Renames

* Fix framset.asm comment spacing

* `BATTLEANIMFRAMESET_35` to `BATTLEANIMFRAMESET_THUNDER_WAVE_EXTRA`

* Feedback applied and labeled 1E & B2

* Fixed SpinningBone

---------

Co-authored-by: vulcandth <vulcandth@gmail.com>
vulcandth added a commit to pret/pokegold that referenced this pull request Aug 22, 2023
* Labeled Framesets and Constants Related

* Feedback Implemented with PascalCase and Constant Renames

* Fix framset.asm comment spacing

* `BATTLEANIMFRAMESET_35` to `BATTLEANIMFRAMESET_THUNDER_WAVE_EXTRA`

* Feedback applied and labeled 1E & B2

* Fixed SpinningBone

---------

Co-authored-by: vulcandth <vulcandth@gmail.com>
github-actions bot pushed a commit to pret/pokegold that referenced this pull request Aug 22, 2023
* Labeled Framesets and Constants Related

* Feedback Implemented with PascalCase and Constant Renames

* Fix framset.asm comment spacing

* `BATTLEANIMFRAMESET_35` to `BATTLEANIMFRAMESET_THUNDER_WAVE_EXTRA`

* Feedback applied and labeled 1E & B2

* Fixed SpinningBone

---------

Co-authored-by: vulcandth <vulcandth@gmail.com>
Idain pushed a commit to Idain/pokecrystal that referenced this pull request Sep 11, 2023
* Labeled Framesets and Constants Related

* Feedback Implemented with PascalCase and Constant Renames

* Fix framset.asm comment spacing

* `BATTLEANIMFRAMESET_35` to `BATTLEANIMFRAMESET_THUNDER_WAVE_EXTRA`

* Feedback applied and labeled 1E & B2

* Fixed SpinningBone

---------

Co-authored-by: vulcandth <vulcandth@gmail.com>
Idain pushed a commit to Idain/pokecrystal that referenced this pull request Sep 12, 2023
* Labeled Framesets and Constants Related

* Feedback Implemented with PascalCase and Constant Renames

* Fix framset.asm comment spacing

* `BATTLEANIMFRAMESET_35` to `BATTLEANIMFRAMESET_THUNDER_WAVE_EXTRA`

* Feedback applied and labeled 1E & B2

* Fixed SpinningBone

---------

Co-authored-by: vulcandth <vulcandth@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants