forked from DizzyEggg/pokeemerald
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Version 1.6.0 #3350
Merged
AsparagusEduardo
merged 373 commits into
rh-hideout:master
from
AsparagusEduardo:RHH/pr/version/1.6.0
Sep 27, 2023
Merged
Version 1.6.0 #3350
AsparagusEduardo
merged 373 commits into
rh-hideout:master
from
AsparagusEduardo:RHH/pr/version/1.6.0
Sep 27, 2023
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
…teMonSpriteToSide
…itionFissureBgOnBattler
- AnimTask_CanBattlerSwitch - AnimTask_BlendMonInAndOut - AnimTask_CentredFrozenIceCube
* [battle, anim] woodhammer animation overhaul * squashme: timings --------- Co-authored-by: sbird <sbird@no.tld>
# Conflicts: # data/battle_anim_scripts.s # data/battle_scripts_1.s # include/constants/battle_move_effects.h
* reset battler IDs before BattleScript_OverworldTerrain and BattleScript_OverworldWeatherStarts to prevent playanimation from executing on invalid battler ids * replace BS_SCRIPTING with BS_BATTLER_0 in BattleScript_OverworldTerrain and BattleScript_OverworldWeatherStarts --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
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.
* Fix tests breaking on modern * modern tests fix - macro and rodata changes * ld script rodata modern
[BUGFIX] for abilities affecting wild encounter tables
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* GetBattlerHoldEffect optimizations * Type fix
* Cmd_transformdataexecution overwrite AI_PARTY data * remove whitespace * add RecordAllMoves --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Add Missing Constant Usage in m4a_1
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
# Conflicts: # asm/macros/battle_script.inc # data/battle_scripts_1.s # include/constants/battle_move_effects.h # include/constants/battle_script_commands.h # include/constants/battle_string_ids.h # src/battle_script_commands.c # src/data/battle_moves.h
Adds support for placing Pokémon in the PC with the B button
# 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
DizzyEggg
approved these changes
Sep 27, 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.
Added
General
Item Effects
Move Effects
Move Animations
Graphics
Changed
General
Graphical changes
Refactors
EFFECT_SEMI_INVULNERABLE
EFFECT_SKY_DROP
B_UPDATED_MOVE_FLAGS
.IS_MOVE_RECOIL
to help recoil move checks.flags
field being removed alongsideTestMoveFlags
andTestMoveFlagsInMoveset
.sParentalBondBannedEffects
to streamline adding new moves.gActiveBattler
fixes by @ghoulslash in Some gActiveBattler Fixes #3259gActiveBattler
variable by @DizzyEggg in Get rid of the gActiveBattler variable #3262VARIOUS
s tocallnative
s by @AsparagusEduardo in Convert various to callnatives - Part 1 #3269EFFECT_REMOVE_TERRAIN
by @LOuroboros in Fixed Ice Spinner, refactored battle terrain text string tables and ditched EFFECT_REMOVE_TERRAIN #3247Move animations
Battle AI
AI_WhoStrikesFirst
considering status priority moves when it shouldn't by @Joggel19 in Fixed AI_WhoStrikesFirst considering status priority moves when it shouldn't #3064FindMonThatAbsorbsOpponentsMove
by @Pawkkie in Add missing absorbing abilities to FindMonThatAbsorbsOpponentsMove #3218CanTargetFaintAi
index issue by @AlexOn1ine in Fixes Toxic Debris + CanTargetFaintAi index issue #3306AI_PARTY
data by @ghoulslash in Transform updates AI_PARTY data #3295Cleanup
u32
in order to speed up processes and AIBattleScript_EffectStomp
andEFFECT_FLINCH_MINIMIZE_HIT
.BattleScript_FlinchEffect
EFFECT_TWISTER
which was a copy ofEFFECT_FLINCH_HIT
.MOVE_UNAVAILABLE
inbattle_ai_util.c
.sMovesNotAffectedByStench
in favor of checking for moves with Flinch chance.EFFECT_GEOMANCY
toIsTwoTurnsMove
.EFFECT_UNUSED_125
by @AlexOn1ine in Refactor Scale Shot to use Canceller Multihit Moves #3290GET_BATTLER_SIDE
(replaced byGetBattlerSide
)GET_BATTLER_SIDE2
(replaced byGetBattlerSide
)GetBattlerPosition
(replaced by direct call togBattlerPositions
)IsBattlerGrounded
by @DizzyEggg in Fix no return in isbattlergrounded #3328GetBattlerHoldEffect
usage optimizations by @AsparagusEduardo in GetBattlerHoldEffect usage optimizations #3330Fixed
Softlocks
SPECIES_NONE
, preventing softlocks when trying to load graphical data for disabled species by @AsparagusEduardo in Disabled species now default their graphics to SPECIES_NONE #3116PC_ITEMS_COUNT
to a value below 19 by @Bassoonian in Fix debug memory overflow #3154General
Graphics
Battle Mechanics
ABILITYEFFECT_ON_TERRAIN
settinggBattlerAbility
incorrectly by @ghoulslash in Fix TryChangeBattleTerrain overwriting gBattlerAttacker and ABILITYEFFECT_ON_TERRAIN #2796TryChangeBattleTerrain
overwritinggBattlerAttacker
by @ghoulslash in Fix TryChangeBattleTerrain overwriting gBattlerAttacker and ABILITYEFFECT_ON_TERRAIN #2796Test Runner
General
Tests added for:
upcoming
by @DizzyEggg in fix protect tests failing on upcoming #3348Pret merges:
DISPLAY_WIDTH
andDISPLAY_HEIGHT
.TEXT_BUFF_ARRAY_COUNT
andPOKEMON_NAME_BUFFER_SIZE
.bravoTrainerTower
documentation.blockBoxRS
field toBoxPokemon
structTryGetAbilityInfluencedWildMonIndex
. 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 theABILITY_STATIC
ability. This never happens in the vanilla codebase.m4a_1
Discord contact info
AsparagusEduardo