"If you wish for it, you can fly" (pret merge 2023-12-10) #3675
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
"SendMonToPC" implies that the Pokémon affected is actually sent over to the PC, but in reality the function simply copies the data of the Pokémon and then pastes it in the first available slot of the Pokémon Storage System.
…mands, the call to TypeCalc does not assign effectiveness flags properly, resulting in the check for immunity always failing
Added BUGFIX for "dual non-immunity" glitch.
Delete the redundant files generated after running build
Rename Undiscovered to No Eggs Discovered
Renamed SendMonToPC to CopyMonToPC instead
Document datahpupdate
Rename HITMARKER_IGNORE_SAFEGUARD to HITMARKER_STATUS_ABILITY_EFFECT. This flag is used exclusively by status-inflicting Abilities, and has 3 main functions: - Whether the effect bypasses Shield Dust - Whether the effect bypasses Safeguard - Which text string to display when the status condition is inflicted (i.e. whether it was inflicted by a move or Ability) I believe this new name better represents what the flag actually does. This name was structured to parallel HITMARKER_SYNCHRONISE_EFFECT.
Rename HITMARKER_IGNORE_SAFEGUARD
Moved files - spinda spots, jp fonts, redyellowgreen_frame.bin
[Build System Rewrite] Linkerscript now tracks RAM/ROM usage
Updated the size of the struct InGameTrade's otName variable
…_20231210 # Conflicts: # Makefile # data/battle_scripts_1.s # gflib/malloc.c # gflib/malloc.h # include/battle.h # ld_script.ld # ld_script_modern.ld # src/battle_ai_script_commands.c # src/battle_main.c # src/battle_script_commands.c # src/battle_util.c # src/data/pokemon/species_info.h # src/pokemon.c
# Conflicts: # src/data/pokemon/species_info.h
mrgriffin
approved these changes
Dec 10, 2023
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
Due to linker changes on pret's side, the only main differences on agbcc are veneer changes (reordering of elements). Besides that and some label changes everything matches in agbcc.
agbcc SHA1 before merge:
f9796c395d49742b8a279f3bee34314225c5a18cagbcc SHA1 after merge:
2d55d8991dc04460ef2d7bc38010be16829900c5modern SHA1 before merge:
bac2955bb02d13e11cdef5cf3e2f5903769ff5e5modern SHA1 after merge:
fc553370a5724f1f9143b5eea72a647d7d27fce7Discord contact info
AsparagusEduardo