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

Great Marsh lookout documentation #345

Merged
merged 9 commits into from
Jan 22, 2025
Merged

Great Marsh lookout documentation #345

merged 9 commits into from
Jan 22, 2025

Conversation

TheSylphIsIn
Copy link
Contributor

Documents:

  • great_marsh_lookout, which handles the scene launched by interacting with the binoculars in the Great Marsh lookout
  • great_marsh_binoculars, which handles the map/mon sprite view part of that scene
  • some incidental stuff I found while working on those, including the func that loads dual slot encounters and some stuff with the SpecialEncounter struct.

@TheSylphIsIn
Great Marsh lookout documentation
e4c73d0 
Documents:
 - great_marsh_lookout, which handles the scene launched by interacting with the binoculars in the Great Marsh lookout
 - great_marsh_binoculars, which handles the map/mon sprite view part of that scene
 - some incidental stuff I found while working on those, including the func that loads dual slot encounters and some stuff with the SpecialEncounter struct
@TheSylphIsIn
Great Marsh lookout documentation
03684d7 
Documents:
 - great_marsh_lookout, which handles the scene launched by interacting with the binoculars in the Great Marsh lookout
 - great_marsh_binoculars, which handles the map/mon sprite view part of that scene
 - some incidental stuff I found while working on those, including the func that loads dual slot encounters and some stuff with the SpecialEncounter struct
@TheSylphIsIn
Merge branch 'main' of https://github.com/TheSylphIsIn/pokeplatinum
935c662
@TheSylphIsIn
Merge errors cleanup
cc8fcca
@lhearachel
Copy link
Collaborator

Can you run the formatter on your local branch and push the results?

TheSylphIsIn and others added 5 commits January 21, 2025 19:48
@TheSylphIsIn
Great Marsh PR review cleanup
f5658f8 
One thing that wasn't addressed is the magic number in great_marsh_binoculars.c. Didn't know what to replace it with.
@TheSylphIsIn
Great Marsh PR cleanup 2
ab7a07a
@lhearachel
Update CI workflow to clang-format v19 and fix some regressions from v18
0d0ba22
@TheSylphIsIn
Merge pull request #1 from lhearachel/clang-format-19
8685ae4 
Update CI workflow to clang-format v19 and fix some regressions from v18
@TheSylphIsIn
Merge branch 'main' of https://github.com/TheSylphIsIn/pokeplatinum
e0bc765
lhearachel
lhearachel reviewed Jan 22, 2025
View reviewed changes
Copy link
Collaborator

@lhearachel lhearachel left a comment

Choose a reason for hiding this comment

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

This looks great! I just have the two nitpick-y comments. Thanks for your contribution. 🙏

asm/macros/scrcmd.inc Outdated Show resolved Hide resolved
include/overlay006/great_marsh_daily_encounters.h Show resolved Hide resolved
@lhearachel lhearachel merged commit 0c1aada into pret:main Jan 22, 2025
2 checks passed
github-actions bot pushed a commit that referenced this pull request Jan 22, 2025
@lhearachel
Merge pull request #345 from TheSylphIsIn/main
04aa774
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Viperio19 Viperio19 Viperio19 left review comments

@lhearachel lhearachel lhearachel approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@TheSylphIsIn @lhearachel @Viperio19