Vagrant Merging Song of Retrospection (Pret merge 2023/09/26) #3347
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixed Mr. Mime capitalization
[LEAK-INFORMED] Add `blockBoxRS` field to `struct BoxPokemon`
fixes a potential buffer overread in TryGetAbilityInfluencedWildMonIndex. The bug can occur if an electric type mon is in the first slots of a fishing encounter table and the player carries a mon with the `ABILITY_STATIC` ability. This never happens in the vanilla codebase.
[BUGFIX] for abilities affecting wild encounter tables
Add Missing Constant Usage in m4a_1
# Conflicts: # include/graphics.h # src/anim_mon_front_pics.c # src/data/graphics/pokemon.h # src/data/pokemon/level_up_learnsets.h # src/data/pokemon/pokedex_text.h # src/data/pokemon_graphics/still_front_pic_table.h # src/wild_encounter.c
AsparagusEduardo
changed the title
|
Forgot to add the hashes. |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
SHA1 before and after merge: 71f09aa902f2469bd6c6c598888368797c765889
SHA1 after bugfixes: c159af0bf9b7cb4beaf45e0efeb93fd182d7fabe
Discord contact info
AsparagusEduardo
If you don't get the title, look it up.