Eduardo Quezada
831b394ca1
Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909
...
# Conflicts:
# Makefile
# include/battle.h
# include/battle_main.h
# include/battle_util.h
# include/data.h
# make_tools.mk
# map_data_rules.mk
# src/battle_setup.c
# src/fieldmap.c
2024-09-11 15:26:14 -03:00
hedara90
b8251e3a75
Another Pledge fix, Powder this time ( #5341 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-08 16:17:18 +02:00
PhallenTree
d6d2f2033d
Fixes Pledge move combo timeout if frozen ( #5340 )
...
Missing `HITMARKER_UNABLE_TO_USE_MOVE` in the frozen canceller
2024-09-08 13:41:23 +02:00
hedara90
03e87a7d62
Pledge fail into opponent pledge loop fix ( #5339 )
...
* Pledge fail into opponent pledge loop fix
* Fixed excessively aggressive canceller
* Move the Pledge bit clear to its proper place
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-08 10:38:52 +02:00
PhallenTree
68701a9e2d
Fix some Pledge move combo issues ( #5330 )
...
Fix Pledge moves looping, adds tests for pledge+incapacitation situations
2024-09-08 08:28:16 +02:00
Cafei
ac7abb6d59
Followers sprite fixes ( #5333 )
...
Follower sprite fixes
Mothim and Combusken shiny fixes
2024-09-07 15:59:09 +02:00
Alex
28287fe80a
Fixes minor wrong order in AI_CalcDamage and adds Tera Blast/Tera Storm ( #5155 )
...
* Fixes minor wrong order in AI_CalcDamage and adds Tera Blast/Tera Storm
* update moveEffect
* fix compile
2024-09-06 21:08:54 +02:00
Liamjd14
e9c0784dc0
Gen 9 Follower pokemon sprites ( #5304 )
...
* Gen 9 Follower Sprites
2024-09-05 22:31:14 +02:00
ghoulslash
ff72723464
Fix Cmd_trainerslidein/out ( #5326 )
...
* fix Cmd_trainerslidein battler Id
* GetBattlerForBattleScript in trainerslideout
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-09-05 20:51:13 +02:00
Pawkkie
9bd5601b5c
Wonder Guard AI Fix ( #5317 )
...
* Fix Wonder Guard looping
* Review + Sheer Cold
2024-09-02 17:43:41 -04:00
SarnPoke
a422db09c6
Fix Slateport Battle Tent/Battle Factory ( #5281 )
...
* Fix Slateport Battle Tent/Battle Factory
Stops the Battle Factory and Slateport Battle Tent from returning no Pokémon when player wants to swap their Pokémon.
* Fix player rental party being junk data after rest
Fixes #5280
* Consolidate checks into single method
Consolidates every gSpecialVar_0x8005 check into a singular method.
2024-09-02 16:53:03 -04:00
hedara90
fb1f12aa1b
Fixed Max Attacks into Max Guards message printing ( #5312 )
...
* Fixed Max Attacks into Max Guards message printing
* Updated the solution
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-02 13:58:10 +02:00
Eduardo Quezada
33d5cbd7a2
Moved ASSUMEs to inside GIVEN blocks ( #5308 )
2024-09-01 23:13:58 +02:00
Alex
6648498e2e
Fixes dmax move base power not seen by ai ( #5299 )
2024-09-01 18:07:18 +02:00
Alex
e09a59a7e4
Fixes Tar Shot on Tera mons ( #5302 )
...
* Fixes Tar Shot on Tera mon
* new line
2024-08-31 12:24:28 -04:00
AgustinGDLV
cfa56962e1
fixed dupe gimmick use in doubles ( #5235 )
...
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2024-08-31 13:15:56 +02:00
hedara90
073d599fc5
Fixed Cinderace GMax back sprite ( #5295 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-31 12:39:56 +02:00
PhallenTree
ac9b40a423
Fixes Max Moves ignoring absorbing abilities, G-Max Corviknight and Centiskorch names ( #5296 )
...
* Fix Max and G-Max Moves bypassing absorbing abilities
* Fix G-Max Corviknight and Centiskorch speciesName
* Remove some outdated comments
* Missing Dynamax check
* Add Max Quake and Max Overgrowth to test
2024-08-31 12:39:37 +02:00
GriffinR
04197b4912
Fix swapped cycling road entrances
2024-08-31 01:54:25 -04:00
GriffinR
4d74dd5e33
Merge pull request #1950 from Icedude907/build-makefile-cleanup
...
[Build System Rewrite] Refactored `Makefile`
2024-08-31 00:36:50 -04:00
GriffinR
a4dd821658
Restore review changes from dependent PR
2024-08-31 00:33:02 -04:00
GriffinR
19ad2e16ac
Merge branch 'master' of https://github.com/pret/pokeemerald into build-makefile-cleanup
2024-08-31 00:17:07 -04:00
Alex
addaf40971
Fixes Scale Shot not activating + Known Failing Round test ( #5292 )
...
* Fixes Scale Shot not activating + Known Failing Round test
* Update test/battle/move_effect/multi_hit.c
2024-08-30 19:36:14 -04:00
Icedude907
625a006cab
[Build System Rewrite] mapjson now takes output directory parameters. ( #1949 )
2024-08-29 14:01:01 -04:00
Cafei
8053f4ab1e
Enable female Indeedee follower and improve shiny Indeedees ( #5285 )
...
Enable Indeedee female follower sprite.
Shiny improvements.
Fix front Indeedee male shading.
2024-08-29 18:14:46 +02:00
cawtds
8af35a7e0d
add Sirfetch'd alias for competitive format ( #5283 )
2024-08-29 08:11:21 -04:00
Cafei
213c097dc0
Paldean Wooper and Clodsire followers ( #5277 )
2024-08-28 11:47:08 +02:00
Alex
98dbf3a575
Fixes Charged up status ( #5274 )
...
Charge changed to last until the damage boost is consumed instead of next turn, previous behavior accessible with `B_CHARGE`
2024-08-27 20:01:51 +02:00
PhallenTree
930cac6aca
Fix Instruct bypassing AtkCanceler, Entry Hazards targeting wrong side of the field if opponent fainted ( #5262 )
...
* Fix Instruct bypassing AtkCanceler + interaction with firstTurnOnly moves
* Fix Entry Hazards targeting the wrong side of the field if opponent fainted
* Remove unused BattleScript_AuroraVeilEnds and STRINGID_AURORAVEILENDS
* Alternative fix + Fix gBattlerTarget initially set to 2
* Fix Instruct animation
* Alternative anim fix
2024-08-27 14:46:56 +02:00
laserXdolphin
c406c4cc76
Fixed Ice Fang frostbite and freeze text. The frostbite and freeze texts were swapped. ( #5273 )
2024-08-27 14:33:58 +02:00
Pawkkie
e9c8bd0548
Revert "Chilly Reception AI" ( #5270 )
2024-08-26 16:58:15 -07:00
hedara90
74c309e2b0
Replaced all usages of tabs in C files with spaces ( #5261 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-26 16:55:54 -07:00
Pawkkie
a9f31dcc4f
Chilly Reception AI ( #5265 )
2024-08-26 18:57:17 -04:00
kittenchilly
03b0d066ce
Update battle_ai_main.c
2024-08-26 16:50:58 -05:00
hedara90
2e43ffd5f7
Fixed Snore not hitting twice with Parental Bond ( #5264 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-26 21:59:39 +02:00
Eduardo Quezada
c075d8e6b1
Fixed test system documentation ( #5266 )
2024-08-26 21:59:01 +02:00
kittenchilly
80ad7f15cc
Chilly Reception AI
2024-08-26 13:09:50 -05:00
GriffinR
bc7c46ffe2
Merge pull request #2026 from mrgriffin/preproc-enum-arbitrary-expr
...
preproc: support arbitrary expressions in enums
2024-08-26 00:02:41 -04:00
SarnPoke
5de0f3cb4a
Add Anger Point/Crit Moves Doubles AI Interaction ( #5244 )
...
* Add Anger Point/Crit Moves AI Interaction
Encourages the AI to use an "always crit" move on its partner, if that partner has the Anger Point ability.
* Add OHKO check
Makes sure that the crit move does not OHKO the partner with Anger Point.
* Fix mistake
Fixes small mistake
* Add Speed Check
Checks if mon is faster than its Anger Point partner when scoring.
2024-08-25 23:38:40 +02:00
kittenchilly
afd18f06b4
Fix switch out move message ( #5258 )
2024-08-25 23:29:33 +02:00
Salem
ceec17ec7b
remove unused bs signature ( #5257 )
2024-08-25 23:13:40 +02:00
Alex
92038129e2
Fixes Purifying Salt being poisoned by Toxic Spikes ( #5252 )
2024-08-25 09:06:03 -04:00
hedara90
51a127fcb5
Better implementation of the obedience fix ( #5245 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-25 11:20:26 +02:00
Hiram Anderson
36a5c6ed4f
Basculin graphics config fix ( #5256 )
...
This fixes a compilation error that occurs if OW_POKEMON_OBJECT_EVENTS is true but P_HISUIAN_FORMS is false.
2024-08-25 10:03:33 +02:00
hedara90
572972235e
Disguise tests ( #5249 )
...
* Start new Disguise tests
* Finished disguise tests
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-24 20:22:50 +02:00
kittenchilly
2fed75f7c5
Adaptability, Aerilate, Aftermath tests ( #5242 )
...
* Adaptability, Aerilate, Aftermath tests
* Update test/battle/ability/aerilate.c
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-08-24 10:53:19 -04:00
PhallenTree
85fe398b50
Fix Starting Status being passed on to future wild battles ( #5248 )
2024-08-24 14:28:24 +02:00
Salem
4208da1e22
add missing break for poison puppeteer ( #5243 )
2024-08-23 18:21:40 +02:00
Cafei
4cc193ebf1
A bunch of fixes for follower Pokemon sprites ( #5241 )
2024-08-23 10:38:09 +02:00
Martin Griffin
ac28fc52e5
Merge pull request #2007 from cawtds/ub-fix-battle-transition
...
UB fix in battle_transition.c
2024-08-21 19:08:07 +01:00
