Update daynight to latest from pret#4
Open
Stevebel wants to merge 1090 commits into
Open
Conversation
One of the strings declared in surf.inc was poorly formatted. ## Description Some of the strings declared in surf.inc contained newline characters in the middle of the .string line, opposing the format used by every string in the `data/text` directory, I just updated them to match the format, making it more readable.
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
Add bugfix from bugs_and_glitches.md to BUGFIX
Document Design Oddity, Use Constants, Correct Comment
Add some battle frontier constant usage
One of the strings declared in BattleFrontier_BattlePikeLobby/scripts.inc was poorly formatted.
Format newline in BattleFrontier_BattlePikeLobby/scripts.inc
Format newlines in surf.inc
Supplant PR pret#1579 (Fix the last of the *.inc inconsistencies)
Fix missing COPYWIN_FULL constant use
Remove UBFIX related to task destruction
Use Floats and Round Correctly in Tempo Calculation
Update some GF rom header names
Identify a % 16
…tion Simplify GetBattleTransitionTypeByMap
[debug] add support for mgba printf
…enGender Gender icon in naming screen based on Pokémon name length
Documented unk40EF in Summary Screen
[doc] clean up casts in decompress.c
Removed unused functions in item header
Add DISPLAY_TILE_* constants
Clean up shop.c
Subsprite Tables Documentation
…it to BATTLE_TYPE_RECORDED_INVALID
Combine "Unused" Field into Tile Buffer
…Disabled Documented missing gSoftResetDisabled uses
…valid Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
13 participants
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.
Merged from pret and properly handled merge conflicts