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

Mystery Gift script commands #273

Merged
merged 27 commits into from
Dec 30, 2023
Merged

Mystery Gift script commands #273

merged 27 commits into from
Dec 30, 2023

Conversation

PikalaxALT
Copy link
Collaborator

Must come after #271

@PikalaxALT PikalaxALT mentioned this pull request Dec 11, 2023
Merged
tgsm
tgsm requested changes Dec 11, 2023
View reviewed changes
src/mystery_gift.c Outdated Show resolved Hide resolved
src/mystery_gift.c Outdated Show resolved Hide resolved
src/scrcmd_11.c Outdated Show resolved Hide resolved
src/scrcmd_11.c Outdated Show resolved Hide resolved
src/scrcmd_11.c Outdated Show resolved Hide resolved
src/scrcmd_11.c Outdated Show resolved Hide resolved
src/scrcmd_11.c Outdated Show resolved Hide resolved
src/scrcmd_11.c Outdated Show resolved Hide resolved
src/scrcmd_mystery_gift.c Outdated Show resolved Hide resolved
src/scrcmd_mystery_gift.c Outdated Show resolved Hide resolved
adrienntindall
adrienntindall requested changes Dec 15, 2023
View reviewed changes
Copy link
Collaborator

@adrienntindall adrienntindall left a comment

Choose a reason for hiding this comment

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

Generally gonna revisit this once the previous branch is merged since I don't want to repeat myself

include/fashion_case.h Outdated Show resolved Hide resolved
include/fashion_case.h Outdated Show resolved Hide resolved
@PikalaxALT PikalaxALT requested a review from tgsm December 17, 2023 02:07
tgsm
tgsm previously approved these changes Dec 18, 2023
View reviewed changes
@adrienntindall adrienntindall dismissed tgsm’s stale review December 19, 2023 16:49

The merge-base changed after approval.

adrienntindall
adrienntindall requested changes Dec 21, 2023
View reviewed changes
src/trainer_memo.c Outdated Show resolved Hide resolved
src/trainer_memo.c Outdated Show resolved Hide resolved
red031000
red031000 requested changes Dec 24, 2023
View reviewed changes
Copy link
Member

@red031000 red031000 left a comment

Choose a reason for hiding this comment

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

please please please abide by the style
there are things I disagree with in the style guide as well, but I still abide by it
the code would be an absolute mess if everyone just did what they wanted to do

include/unk_020290B4.h Outdated Show resolved Hide resolved
main.lsf Outdated Show resolved Hide resolved
src/field/scrcmd_mystery_gift.c Outdated Show resolved Hide resolved
src/field/scrcmd_mystery_gift.c Outdated Show resolved Hide resolved
src/field/scrcmd_mystery_gift.c Outdated Show resolved Hide resolved
src/field/scrcmd_mystery_gift.c Outdated Show resolved Hide resolved
src/field/scrcmd_mystery_gift.c Outdated Show resolved Hide resolved
src/field/scrcmd_mystery_gift.c Outdated Show resolved Hide resolved
src/field/scrcmd_mystery_gift.c Outdated Show resolved Hide resolved
src/field/scrcmd_mystery_gift.c Outdated Show resolved Hide resolved
red031000
red031000 requested changes Dec 28, 2023
View reviewed changes
Copy link
Member

@red031000 red031000 left a comment

Choose a reason for hiding this comment

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

to merge: apply clang format to changes in unk_020290B4.h, then move scrcmd_mystery_gift.c out of the field folder

@adrienntindall adrienntindall merged commit 02c492d into pret:master Dec 30, 2023
1 check passed
github-actions bot pushed a commit that referenced this pull request Dec 30, 2023
@adrienntindall
Merge pull request #273 from PikalaxALT/scrcmd_11
dc34850
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adrienntindall adrienntindall adrienntindall approved these changes

@red031000 red031000 red031000 approved these changes

@tgsm tgsm tgsm left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@PikalaxALT @tgsm @red031000 @adrienntindall