Commit graph

11413 commits

Author SHA1 Message Date
Alex
9f1b900809
Fixes Ice Face regression (#5678) 2024-11-17 16:36:55 -03:00
AERDU
5388ed0cad
Mimicry updates typing with RemoveAllTerrains() (#5666)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-11-17 10:21:01 +01:00
kittenchilly
c4d83079a9
PokeCommunity sprites batch (October) (#5655) 2024-11-15 21:16:41 +01:00
Alex
b55c87f73f
Fixes Take heart (#5658)
Co-authored-by: KyleLaporte <moog272@gmail.com>
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-11-11 14:58:09 -05:00
Alex
a8351e305c
Fixes Red Card / Eject Pack interaction with Emergency Exit (#5657)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-11-11 14:56:51 -05:00
Alex
afc7795afc
Removes duplicate Booster Energy code (#5656) 2024-11-11 17:48:23 +01:00
Alex
dc740b4e9a
Fixes Magic Coat message (#5645) 2024-11-06 10:09:00 +01:00
Bassoonian
6d38e260d6 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5nov 2024-11-05 10:31:40 +01:00
Alex
45d063dcf8
Fixes Dragon Tail using the effect twice during a Parental Bond attack (#5630)
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-11-02 09:38:29 -03:00
Alex
2aef530bfa
Fixes dynamicMoveType global not being reset during AI calcs (#5628) 2024-11-01 11:10:17 +01:00
Alex
e9ab070e7d
Fix damage calc modifiers (#5604)
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-10-27 18:47:02 -03:00
hedara90
c6ccc29c93
Fixed 64px uncompressed followers (#5601)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-10-27 11:24:40 -03:00
Alex
ad16fa76f2
Fixes Magic Guard not preventing Salt Cure (#5583) 2024-10-26 10:11:45 +02:00
hedara90
5dcf3e7664
Fixed Shiny Pokemon not being shiny after transforming with a gimmick (#5573)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-10-25 07:42:06 -05:00
Pawkkie
b892ad4da6
Shed Skin chance fix (#5558) 2024-10-24 11:59:49 +02:00
Martin Griffin
2a610443ab
Missing string_util.h include in mini_printf.c 2024-10-23 20:09:29 +01:00
RavePossum
0ad77db4b4
Fix HGSS dex search printing wrong mon after selecting evos (#5552) 2024-10-22 16:28:11 +02:00
RavePossum
afc89f53b0
Fix weather genie move anims and springtide storm targets (#5553) 2024-10-22 16:27:10 +02:00
Martin Griffin
1421ed1b24
Tests: detect task leaks (#5528) 2024-10-22 10:19:00 +02:00
Frank
544b76fbbf Added value for bard sound length 2024-10-21 09:04:42 -04:00
Alex
5291117687
Global is used instead of passed var (#5546)
In `AI_CalcDamage` a global was used for the Terastorm check instead of passed var
2024-10-20 14:28:36 +02:00
ghoulslash
d487bd0548
Revival Blessing fixes + Using Lunar Blessing's animation (#5490)
* revival blessing fixes, add anim

* fix lunar blessing anim

* Added support for Revival Blessing in tests

* Added test to confirm absent flag fix

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-10-19 11:34:58 -03:00
psf
8d7996dc5b
Added constant to expansion inclusive copyright magic number (#5413)
* Added constant to expansion inclusive copyright magic number

* Fixed open brackets
2024-10-18 18:06:04 -03:00
Bassoonian
3077592e68
Pret merge 2024-10-15 (#5527) 2024-10-17 09:00:18 +02:00
Eduardo Quezada
e230f379b3
Fixed 10,000,000 Volt Thunderbolt name (#5533) 2024-10-16 17:46:40 -03:00
AlexOn1ine
d044f53c72 Adds tests and Costar fix from PR #5526 2024-10-16 10:51:41 +02:00
Eduardo Quezada
9ed153ff93 Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015 2024-10-15 22:22:52 -03:00
Eduardo Quezada
80447bee8e Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015 2024-10-15 20:56:56 -03:00
Alex
ed65c4a2f7
Fixes Partner targeting and Acupressure/Ally Switch interaction (#5446)
* Fixes Partner targeting and Acupressure/Ally Switch interaction

* More tests

* Update test/battle/move.c
2024-10-15 17:04:35 -04:00
Bassoonian
b9ac5d1d8a
Add newline to move relearner string (#5523) 2024-10-15 21:58:58 +02:00
luckytyphlosion
a55c75d350
Get rid of common syms (#2040) 2024-10-14 23:52:11 -04:00
psf
c82ff7b5b1
Merrp merge (12th of October) (#5514)
Co-authored-by: Ariel A <24759293+aarant@users.noreply.github.com>
Fixes #5482
2024-10-12 10:50:31 -07:00
kittenchilly
743dc4d765
Add text fitting tests for move, ability, item, and pokedex descriptions (#5505) 2024-10-12 19:37:11 +02:00
Bassoonian
8dba27249c Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into merrpmerge1210 2024-10-12 18:41:33 +02:00
Ariel A
e10005010e Merge branch 'followers' into followers-expanded-id 2024-10-12 12:27:05 -04:00
Ariel A
d80190fe10 fix: Dig in Sealed Chamber no longer freezes follower. Fixed #5482 rhh 2024-10-12 12:23:18 -04:00
Bassoonian
b5c884504c
Fix negative mutation value (#5504) 2024-10-11 19:49:24 +02:00
kittenchilly
8890500b77
Fix P_FRIENDSHIP_EVO_THRESHOLD not checking for Gen 8 (#5503) 2024-10-10 21:26:46 +02:00
PhallenTree
8d2d62273b
Updated ability popups for Skill Swap, Mummy/Lingering Aroma, Worry Seed, Simple Beam, fix Doodle/Role Play bugs (#5493)
* Updated ability popups of Skill Swap, Mummy/Lingering Aroma, Worry Seed, Simple Beam, Fix Doodle and Role Play issues

* More Doodle fixes

* Add tests

* Fix Doodle not activating if partner is fainted and its ability cannot be suppressed

* Fix tests compile

* Commander cantBeOverwritten

* Add battle script for Overwrite then Regular ability
2024-10-10 18:36:01 +02:00
Rose
9ad0018c17 Fix typo: | should be || in Task_TryFieldPoisonWhiteOut
Yes, this is honestly overkill, as it doesn't actually fix any behavioral bugs, but I was suggested to do this. This was a typo made in the source that GameFreak made, and the compiler warns against this. I opened a PR in pokeemerald expansion and was suggested to open one here.
2024-10-10 10:27:33 -04:00
Alex
3c3ce38378
Remove one redundant call of SetAiLogicDataForTurn in DoBattleIntro (#5491)
This is already run at the end of `TryDoEventsBeforeFirstTurn` which makes the first calc redundant.

I've had this removed in my project for a while and didn't notice any problems
2024-10-09 17:18:08 +02:00
Pawkkie
7fc5502afd
Don't clear move data on turn end (#5488) 2024-10-09 09:38:49 +02:00
Eduardo Quezada
a76f7fe92e
Version 1.9.3 (#5485)
* Version 1.9.3

* Updated to latest master
2024-10-08 14:45:09 -03:00
hedara90
f8f4fc9afd
Removed old checksum matching workaround (#5480)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-10-08 14:02:31 +02:00
ghoulslash
06fefe3318
Various AI fixes (#5474)
* fix AI mirror move check viability call

* fix EFFECT_ABSORB missing break in AI_CalcMoveEffectScore

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-10-06 21:05:29 +02:00
wiz1989
6f59d26753
updated Conversion 2 mechanics to 5+ (#5453)
* updated Conversion 2 mechanics and added the toggle B_UPDATED_CONVERSION_2

* fixes and added new test cases

* bugfixing and added EWRAM u16 gLastUsedMoveType

* update after Pawkkie review

---------

Co-authored-by: wiz1989 <wiz1989@LAPTOP-8Q3TPMGC.localdomain>
2024-10-04 12:42:15 -04:00
Eduardo Quezada
0f8b2a1ba8 Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909 2024-10-04 10:23:58 -03:00
PhallenTree
91325e83c1
Fixes to Protosynthesis, Quark Drive, Beast Boost, Orichalcum Pulse, Hadron Engine (#5447)
* Protosynthesis & Quark Drive interactions; Fixes to Beast Boost/Protosynthesis/Quark Drive stat tie priority, Orichalcum Pulse and Hadron Engine stat boost

* Protosynthesis + Quark Drive tests

* Update src/battle_util.c

* Update src/battle_util.c

* Update src/battle_util.c

* Update src/battle_util.c

* Update src/battle_util.c

* Update src/battle_util.c

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-10-04 11:00:12 +02:00
ghoulslash
be5f2e095e
fix duplicating flute glitch (#5436)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-10-03 13:01:18 +02:00
psf
9a24c031bb
Replaced copyright magic numbers in intro.c with constants (#2035) 2024-10-02 20:48:54 -04:00