Version 1.10.0 #5752
Merged
Version 1.10.0 #5752
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
* Created gFrontierBrainInfo with trainerId * Added objEventGfx and isFemale * Added win/loss texts * Added battleBit and streakAppearances * Added macro for texts * Added macro for sprites
* Fixed issue where tiles were not freed * Updated to destroy first * Cleaned up returns * Added typeIconTags Added FreeAllTypeIconResources Fixed issue where typeIcons were not being properly handled when hidden
* Removed some hardcoding of move IDs * Added Defog Gen6+ config (+ updated tests)
* Converted Match Call names and descriptions to COMPOUND_STRINGs * Moved May/Brendan and Elite Four descriptions into pokenav_match_call_data.c * Moved Steven, Brendan, and May's Match Call text to pokenav_match_call_data.c * Cleaned up Steven's Match Call text * Added PokeNav option text to match_call_gfx * Moved PokeNav page descriptions to menu_handler_gfx * Moved help bar texts to pokenav_main_menu.c * Moved various PokeNav strings out of strings.c and into their relevant files * Removed unused PokeNav strings
…ect (#5186) * Consolidated Rotom move values * Updated changing Rotom into its base form to its Gen9 effect * Fixed order of if statement
* Replaced all the gBitTable[X] usages with 1 << X, and cleaned up script output * Fixed failed merge in online viewer --------- Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Hedara <hedara90@gmail.com>
* Added OW_BERRY_IMMORTAL Added cases for OW_BERRY_IMMORTAL * removed one preproc * removed other preproc * Fixed identation * Set config to FALSE * Update include/config/overworld.h per rh-hideout#5187 (comment) Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> * Reordered condition per https://github.com/rh-hideout/pokeemerald-expansion/pull/5187\#discussion_r1720747652 * Update include/config/overworld.h --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* DoBattleIntro state documentation * Removed unused state * Update src/battle_main.c Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> * Fixed state jumps * BattleStruct state uses enum * Renamed state enums --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Weatherball fire type check changed to WEATHER_DROUGHT, added overworld check for field terrain set by weather dependent on configs * Update src/pokemon.c FRICKIN INDENTS LMAO Co-authored-by: Eduardo Quezada <93919226+equezada-jej@users.noreply.github.com> --------- Co-authored-by: Eduardo Quezada <93919226+equezada-jej@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Hedara <hedara90@gmail.com> Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com> Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
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.
Wait for #5752 and DO NOT SQUASH
Discord contact info
AsparagusEduardo