Commit graph

15719 commits

Author SHA1 Message Date
Pawkkie
9f845a79e5
Fix Switch AI Bug: AI never switching out when it could be OHKO'd (#5089)
* Fix switch AI bug

* Forgot to save a file lol

* Fix infinite loop test compatibility
2024-08-07 15:58:39 +02:00
Eduardo Quezada
ce74c85e4f
Move effect TODO tests - Volume C (#5094) 2024-08-07 15:52:40 +02:00
kittenchilly
e4f09c8103
Move Relearner now displays move category (#5081)
* Move relearner now displays move category

* Update move_relearner.c

* Update move_relearner.c

* Address reviews
2024-08-06 23:58:18 +02:00
hedara90
db3bb40c1a
Accidentaly the Giratina origin overworld shiny pal (#5108)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-06 14:22:51 -05:00
tertu
08f8ccd9eb
Follower palette fix (#5107) 2024-08-06 11:52:05 -05:00
Hedara
a9492f5b1c Fixed Xerneas 2024-08-06 16:52:42 +02:00
Hedara
29bb658d1b Fixed some overworld palettes 2024-08-06 13:25:26 +02:00
PhallenTree
67f049fddb
Fixes Defiant interaction with Court Changed Sticky Web + Fickle Beam description (#5093)
* Fixes Court Changed Sticky Web deactivating Defiant/Competitive

* Fixes Fickle Beam's description

* Alternative fix

* Remove extra newLine
2024-08-06 10:45:30 +02:00
Eduardo Quezada
9e9825853e
Pret Merge (5th of August) (#5098) 2024-08-05 22:03:26 -04:00
Bassoonian
55159bedd7 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5aug 2024-08-05 23:32:38 +02:00
Philipp AUER
1f93c25611
use OBJ_EVENT_GFX_SPECIES_MASK in bufferspeciesname (#5088)
Co-authored-by: sbird <sbird@no.tld>
2024-08-05 15:18:35 -04:00
GriffinR
9a3c6d072b
Merge pull request #2018 from fdeblasio/fixMtPyreLabel
Fixed bottom half of Mt. Pyre not being labeled in PokeNav
2024-08-05 11:27:01 -04:00
toon
fd3cb6f96b
How to docs and fixes to be added to the mdbook documentation site (#5070)
* Added most of the documentation from the wiki to the mdbook site directory and fixed some errors

* Removed the infinite repel documentation file

* Update docs/SUMMARY.md

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-08-05 09:26:14 -04:00
Alex
41a79e3833
IsValidForBattle function formatting (#5085)
ocd
2024-08-03 22:23:34 +01:00
Martin Griffin
9d97537ee2
Fix speed ties (#4780)
* Fix speed ties

* fixup! Fix speed ties

* fixup! Fix speed ties

* fixup! fixup! Fix speed ties

* fixup! Fix speed ties

* Workaround for Comatose-Ditto interaction
2024-08-03 17:29:47 +02:00
Martin Griffin
ed20ff5e8b
Improve 1.8 ⇒ 1.9 non-Competitive syntax migration instructions (#5079) 2024-08-02 20:15:09 +01:00
Martin Griffin
841bac21cd Improve 1.8 => 1.9 COMPETITIVE_PARTY_SYNTAX changelog entry 2024-08-02 19:57:58 +01:00
hedara90
45835a2c33
Fixed stray transparent pixels in Urshifu sprites (#5071)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-02 11:48:20 -07:00
Eduardo Quezada
512c44b698 Start 1.9.1 cycle 2024-08-01 17:04:48 -04:00
Eduardo Quezada
a2685d0d08
Version 1.9.0 (#5076) 2024-08-01 20:09:06 -04:00
Eduardo Quezada
483121dfc0
Version 1.8.6 (#5005) 2024-08-01 19:52:29 -04:00
Eduardo Quezada
7ec24b89c8 Merge branch '_RHH/upcoming' into _RHH/pr/master/1.9.0 2024-08-01 16:58:19 -04:00
Eduardo Quezada
f95322628d Merge branch '_RHH/upcoming' into _RHH/pr/master/1.9.0 2024-08-01 16:47:50 -04:00
Frank
62b4ea5aaa Fixed bottom half of Mt. Pyre not being labeled in PokeNav 2024-08-01 13:34:17 -04:00
Eduardo Quezada
57fc0fd3b9 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-01 08:36:11 -04:00
Alex
de8002e9e0
Removes unnecessary checks for Shield Dust and Covert Cloak (#5073)
* Removes unnecessary checks for Shield Dust and Covert Cloak

* remove redundant include

* Update test/battle/ability/shield_dust.c

Co-authored-by: hedara90 <90hedara@gmail.com>

* Update test/battle/hold_effect/covert_cloak.c

Co-authored-by: hedara90 <90hedara@gmail.com>

---------

Co-authored-by: hedara90 <90hedara@gmail.com>
2024-08-01 09:58:14 +02:00
Eduardo Quezada
8450268b74 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/data/battle_anim.h
2024-07-31 18:13:19 -04:00
Alex
3b9ea5b54c
Adds battle frontier conversion script (#5040)
Adds script to convert battle frontier mons to new format
Fixes existing battle frontier mons to match vanilla
2024-07-31 15:04:21 -07:00
tertu
05ff7cef1c
Tweak IV generation slightly (#4876)
With HQ_RANDOM on, this means that the generator now only consumes one RNG output when generating IVs.
Without HQ_RANDOM on, IV generation should be unchanged.
2024-07-31 19:51:47 +02:00
Alex
e6175b5b84
Fixes spread damage in double battles (#5064)
* Fixes spread move damage in doubles

* add DoubleBattle check

* add additional check to test

* restore trainer party
2024-07-31 12:20:57 +02:00
nooT
a89fc9de69
Added AI Flags Documentation To Directory For New Documentation Site (#5057)
* Ported the wiki file ai flags to the /docs directory for the new documentation site

* Revised AI flag documentation based on reviewer feedback

* New comparitive clauses for; AI_FLAG_STRONGEST_MOVE and AI_FLAG_TRY_TO_FAINT

* Added an entry to the navigation menu for the AI Flags docs

* Added an entry to the navigation menu for the AI Flags docs
2024-07-30 21:36:35 +02:00
PhallenTree
ab9f8e69fb
Fixes Stalwart/Propeller Tail, Life Orb on confusion, Remove Status wrong battlescripts (#5061)
* Fix swapped BattleScripts in MoveEffectRemoveStatus for Freeze/Frostbite

* Fix Life Orb damaging the user if they hit themselves in confusion

* Fix Stalwart/Propeller Tail not ignoring redirection from Storm Drain/Lightning Rod

* Parametrize Species
2024-07-30 10:36:22 +02:00
hedara90
74220518d4
Fixed the animation tables being different sizes (#5063)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-29 13:34:19 -04:00
Eduardo Quezada
3372503430
Added OBJ_EVENT_GFX_SPECIES_SHINY macro (#5049)
* Added OBJ_EVENT_GFX_SPECIES_SHINY

* Update src/event_object_movement.c

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-29 18:41:03 +02:00
Eduardo Quezada
54c19af037
Fixed B_HEAL_BELL_SOUNDPROOF checking for Gen9+ instead of Gen8+ (#5060) 2024-07-29 16:28:32 +02:00
Eduardo Quezada
b4eca0a6ec Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	data/battle_anim_scripts.s
#	src/battle_util.c
2024-07-29 09:36:16 -04:00
hedara90
a89820fa96
Fixed Hidden Power damage category for PSS < GEN_4 (#5053)
* Fixed Hidden Power damage category for PSS < GEN_4

* Fixed category display regression

* Wrapped GET_MOVE_TYPE

---------

Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-29 13:45:14 +02:00
hedara90
b54226dde3
Add Axe Kick animation (#5039) 2024-07-28 20:03:34 +02:00
kittenchilly
904d59220d Shorten squish anim 2024-07-28 11:55:57 -05:00
kittenchilly
9979fe01ac Update battle_anim_scripts.s 2024-07-28 11:47:49 -05:00
kittenchilly
f22666c2a3 Merge branch 'master' into axekick-anim 2024-07-28 11:46:14 -05:00
Eduardo Quezada
18aff2db3b Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	asm/macros/battle_anim_script.inc
#	data/battle_anim_scripts.s
#	include/constants/battle_anim.h
#	src/battle_anim.c
#	src/data/battle_anim.h
2024-07-27 16:26:37 -04:00
Eduardo Quezada
bb471746d6
Renamed EVO_DEFEAT_WITH_ITEM to EVO_DEFEAT_THREE_WITH_ITEM (#5046) 2024-07-27 21:41:05 +02:00
Eduardo Quezada
1e8773356c
Changed EVO_OVERWORLD_STEPS to use an EWRAM variable (#5047)
* Changed EVO_OVERWORLD_STEPS to use an EWRAM variable

* Fixed PC swapping not resetting the follower steps
2024-07-27 20:48:59 +02:00
Eduardo Quezada
1cf2592a9b
Pret Merge (27th of July) (#5045) 2024-07-27 10:17:07 -04:00
Bassoonian
c603e11310 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge27july 2024-07-27 12:01:39 +02:00
Martin Griffin
30f8ccfe6e
Merge pull request #2017 from PokemonSanFran/numSnowflakeSpritesConstant
Added constant for NUM_SNOWFLAKE_SPRITES
2024-07-27 07:26:40 +01:00
pkmnsnfrn
91b48a10d4 Added constant for NUM_SNOWFLAKE_SPRITES 2024-07-26 21:57:42 -07:00
luckytyphlosion
7316e54161
Merge pull request #2016 from luckytyphlosion/master
Fix WSL1 install instructions
2024-07-26 19:22:58 -04:00
DizzyEggg
e82e3b4198
Allow flags in trigger scripts (#4900) 2024-07-26 23:46:33 +02:00