Friday merge, what a concept (weekly pret merge 2022/09/09) #2308
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
If there are not externs on these forward declarations, it's entirely possible for the program to link and missing data to be assigned to someplace presumed in IWRAM or something.
Adding missing externs
…ainerMonAlign Aligned FRONTIER_MONS trainer macros with the rest for consistency
Fix names and constant usage for union room classes
…ync4 Implemented review changes from pret/pokefirered#548
[doc] fix misnamed dma <--> aslr
Undefined temporary preproc macro HIBYTE
Fix 'y' actually being 'x' in CreatePCMultichoice
Adjusted style of coords tables
…rings Removed repeated extern consts in strings.h
…0909 # Conflicts: # src/battle_controller_link_opponent.c # src/battle_controller_opponent.c # src/battle_controller_recorded_opponent.c # src/battle_controllers.c # src/data/pokemon_graphics/back_pic_coordinates.h # src/data/pokemon_graphics/front_pic_coordinates.h # src/pokemon.c
AsparagusEduardo
changed the title
Added parenthesis to GET_SHINY_VALUE
Sync fieldmap
…eaders Added missing labels in headers
Fixed a typo and scripting vars alignment
…itespace Cleaned trailing whitespace
Removed unused extern declaration of old gUnknown func
Drop usage of global directive
…0909 # Conflicts: # asm/macros/battle_ai_script.inc # asm/macros/battle_script.inc # data/battle_ai_scripts.s # include/link_rfu.h # src/pokemon.c # src/pokemon_summary_screen.c # src/sound.c
# Conflicts: # src/battle_interface.c
|
Solved conflicts. |
This was referenced Sep 16, 2022
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
Conflicts:
SHA1 before and after merge: D150B1F44342B7C2EE2E51F95D985946A41764D1
Discord contact info
AsparagusEduardo#6051