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

Halloween Pret merge #3468

Closed
wants to merge 18 commits into from
Closed

Halloween Pret merge #3468

wants to merge 18 commits into from

Conversation

Bassoonian
Copy link
Collaborator

Merge without conflicts!

Hash before: b7a687f50eee171ab33c58c0764b8d4950e5daa1298db4201f8216338c8328b2
Hash after: 81fc86838208dbf2215529c9f904828f10af64c9b07816d0f843c90b1d664aaf

Discord contact info

bassoonian

GriffinRichards and others added 18 commits August 19, 2023 17:20
@GriffinRichards
Document Task_MapNamePopUpWindow
5beec06
@GriffinRichards
Document title screen task data
6792028
@GriffinRichards
Add defines for field effect sprite data, misc task data
56ff4ce
@AnonymousRandomPerson
Replaced decomp list with pret.github.io link
a8d0a0d
@KABoissonneault
Fixed out-of-bounds access in GetFactoryMonFixedIV when generating pl…
3a8a82d 
…ayer rentals in round 8 (if player has 15+ swaps) and in round 9
@KABoissonneault
Changed sFixedIVTable access from hardcoded index limits to ARRAY_COUNT
0a183c2
@GriffinRichards
Merge pull request rh-hideout#1930 from KABoissonneault/fix/factory_oob
dec4b58 
Fixed out-of-bounds access in GetFactoryMonFixedIV for BUGFIX
@GriffinRichards
Add some missing trainer hill constant usage
6f71fbe
@ketsuban
Remove fakematch in NewGameInitPCItems
054d0f9
@marlux895
corrected comment, tough to smart
0e84c7d
@GriffinRichards
Merge branch 'master' into misc-tasks
f01a6af
@GriffinRichards
Merge pull request rh-hideout#1915 from GriffinRichards/misc-tasks
104e81b 
Add some task/sprite data defines
@GriffinRichards
Merge pull request rh-hideout#1919 from AnonymousRandomPerson/master
ad0c28d 
Replaced decomp list with pret.github.io link
@kittenchilly
Remove all leading whitespace
333523e
@AsparagusEduardo
Fix mini_printf encoded string -Werror=pointer-sign warning
25d6f8b
@GriffinRichards
Merge pull request rh-hideout#1938 from AsparagusEduardo/pret/pr2/nde…
3a8df46 
…bugModern

Fix mini_printf encoded string -Werror=pointer-sign warning
@GriffinRichards
Merge pull request rh-hideout#1937 from kittenchilly/removewhitespace
c169b85 
Remove all trailing whitespace
@Bassoonian
Merge branch 'master' of https://github.com/pret/pokeemerald into pre…
f69291a 
…tmergeoctober
AsparagusEduardo
AsparagusEduardo requested changes Oct 26, 2023
View reviewed changes
Copy link
Collaborator

@AsparagusEduardo AsparagusEduardo 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 hash changes, you need to document why. There may not be conflicts, but something might break if you don't know why it changed.

@SBird1337 SBird1337 mentioned this pull request Oct 26, 2023
Closed
@Bassoonian
Copy link
Collaborator Author

If the hash changes, you need to document why. There may not be conflicts, but something might break if you don't know why it changed.

There was a bugfix in the battle factory, I assume that's why

@AsparagusEduardo
Copy link
Collaborator

There was a bugfix in the battle factory, I assume that's why

It was more than that. The whole point of the hashes is to make sure that stuff stays just like we left them after the merge.
What I do is have the merge commit match the current hash by changing the code and then reverting the specific changes to properly incorporate the upstream bugfixes.

@AsparagusEduardo AsparagusEduardo mentioned this pull request Oct 27, 2023
Merged
@AsparagusEduardo
Copy link
Collaborator

It was more than that.

My bad, I assumed that you had this PR pret#1935.

Still, there shouldn't be assumptions, gotta confirm by reverting the changes to see if it matches.

@Bassoonian Bassoonian closed this Oct 27, 2023
@Bassoonian Bassoonian deleted the pretmergeoctober branch October 29, 2023 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AsparagusEduardo AsparagusEduardo AsparagusEduardo requested changes

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

Successfully merging this pull request may close these issues.
8 participants
@Bassoonian @AsparagusEduardo @GriffinRichards @AnonymousRandomPerson @KABoissonneault @ketsuban @marlux895 @kittenchilly