Skip to content
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
Merged

Conversation

AsparagusEduardo
Copy link
Collaborator

@AsparagusEduardo AsparagusEduardo commented Sep 27, 2023

Added

General

Item Effects

Move Effects

Move Animations

Graphics

Changed

General

Graphical changes

Refactors

Move animations

Battle AI

Cleanup

Fixed

Softlocks

General

Graphics

Battle Mechanics

Test Runner

General

Tests added for:

Pret merges:

  • Pret merge (2023/08/31) by @AsparagusEduardo in Pret merge (2023/08/31) #3268
    • VAR_TEMP aliases
    • TM and HM item constants by their move name without numbers.
    • Stat change documentation.
    • Factory Menu + Dome Tourney documentation.
    • Berry Fix Documentation.
    • Missing uses of DISPLAY_WIDTH and DISPLAY_HEIGHT.
    • Static assertion for Battle Palace Flags.
    • Static assertion for Rotating Gates.
    • Automatic increase of TEXT_BUFF_ARRAY_COUNT and POKEMON_NAME_BUFFER_SIZE.
    • Proper bravoTrainerTower documentation.
    • Birth Island Rock documentation.
    • 6 new bugfixes.
  • Pret merge (2023/09/26) by @AsparagusEduardo in Vagrant Merging Song of Retrospection (Pret merge 2023/09/26) #3347
    • Add include guards for assembly constants files
    • Add blockBoxRS field to BoxPokemon struct
    • Bugfix for abilities affecting wild encounter tables
      • 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.
    • Add missing constant usage in m4a_1

Discord contact info

AsparagusEduardo

AsparagusEduardo and others added 30 commits August 1, 2023 19:02
- 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>
sbird and others added 27 commits September 15, 2023 19:11
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
@AsparagusEduardo AsparagusEduardo merged commit 7b3f72f into rh-hideout:master Sep 27, 2023
1 check passed
@AsparagusEduardo AsparagusEduardo deleted the RHH/pr/version/1.6.0 branch May 14, 2024 22:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.