4533 Commits

Author SHA1 Message Date
Eduardo Quezada
d2acc2d7d6 Changed instances of "But it failed" to "It doesn't affect X" 2025-08-11 13:33:56 -04:00
Eduardo Quezada
db0ca2ce49 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/messages 2025-08-11 12:39:28 -04:00
Eduardo Quezada
a9d5c2cd28
Updated Dream Eater/Liquid Ooze's interaction to Gen 5 standards (#7528) 2025-08-11 16:06:58 +02:00
AlexOn1ine
bd919e3219 11/08/25 Master to upcoming merge 2025-08-11 08:31:12 +02:00
Eduardo Quezada
c87d3b1769 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/messages 2025-08-10 21:29:01 -04:00
AlexOn1ine
0eb715de11 Add rock climb history from ghoul 2025-08-05 20:47:05 +02:00
Alex
acc82e7d79
Convert Status4 to volatiles (#7411)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-08-05 19:28:33 +02:00
AlexOn1ine
54ffc6bf08 Fixes Leech Seed recovery not applying behind Sub 2025-08-03 21:59:48 +02:00
pokesidv
4d31693005
Rock climb by ghoulslash (#7432)
Co-authored-by: Evan <eroelke@gmail.com>
Co-authored-by: Jaizu <jaizu85@gmail.com>
Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-08-03 14:52:07 +02:00
Alex
ed44da8644
Add a heal animation to Hospitality recovery (#7426) 2025-08-02 11:56:00 +01:00
Linathan
9faa5294ce
Wild Pokémon animate after breaking out of Poké Ball (#7339) 2025-08-01 18:14:42 +02:00
AlexOn1ine
bc73f4654b merge master 31/07/25 2025-08-01 12:18:11 +02:00
PhallenTree
01105171a3
Fixes Magnet Rise when user is Rooted/Smacked Down (#7449) 2025-07-31 19:30:50 +02:00
Alex
038bd2717d
Pret merge (27th of July, 2025) (#7422) 2025-07-28 15:13:23 +02:00
PhallenTree
8bfc5b3093
Fixes Razor Wind not activating after hit effects after the first target (#7413) 2025-07-28 14:21:12 +02:00
Eduardo Quezada
d801556a97 Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727 2025-07-27 11:59:07 -04:00
Alex
38964e4f0a
Fixes Wandering Spirit overwriting battlers (#7407) 2025-07-25 13:26:12 -04:00
AlexOn1ine
90eef35715 master merge 2025-07-19 17:01:18 +02:00
Alex
71d40cc3f1
Convert various to callnatives (#7355) 2025-07-18 19:12:37 +02:00
Alex
705f194d98
Fixes various battler corruption during switch in ability activation (#7352) 2025-07-18 12:28:00 +02:00
AERDU
da3d223c45
fallback bugfix for B_DARK_VOID_FAIL < GEN_7 (#7351) 2025-07-16 12:41:32 +02:00
Frank DeBlasio
c9ec896312
Refactor battle environment (#4891) 2025-07-12 12:38:06 -04:00
AlexOn1ine
68db4c5a77 12/07/25 master to upcoming merge 2025-07-12 11:55:06 +02:00
Nephrite
a1e67572b6
Replaces STATUS2 usage with volatiles in code (#7262)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-07-11 22:53:49 +02:00
Linathan
9228826ae1
New and polished battle animations (#7074) 2025-07-11 19:14:19 +02:00
ghoulslash
c7b2c771e1
Cotton down use jumpifabsent (#7318)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-07-11 09:43:14 +02:00
mudskipper13
0d09e5cce8
battle_interface: overhaul ability pop up (#7227) 2025-07-10 19:09:52 +02:00
Alex
31a561201b
Adds hazard queue (#7295) 2025-07-07 15:30:35 -04:00
Alex
7ae97ab6e9
Refactor move Synchronise (#7271) 2025-07-07 13:36:21 -04:00
Alex
0422a013c4
Add Set Hidden Nature option to the debug menu (#7281) 2025-07-07 13:33:57 -04:00
Alex
f808201945
Fixes Natural Gift moveend execution (#7274) 2025-07-05 15:05:35 -04:00
PhallenTree
38a3963ec2
Fix Psych Up message and cleanup and don't allow switching to self in tests (#7277) 2025-07-05 14:47:36 +02:00
hedara90
56907bc26e
Merrp merge, 2025-06-25 (#7217) 2025-07-04 13:03:09 +02:00
hedara90
ae1d99bb4f
Master to upcoming merge 01/07/25 (#7267) 2025-07-02 11:39:59 +02:00
AlexOn1ine
aa9ff53b81 master to upcoming merge 2025-07-02 10:05:31 +02:00
Alex
c27cc2ed70
Script clean up for Flame Burst and Costar (#7264) 2025-07-02 09:16:05 +02:00
Alex
be2d36b6ee
Fixes instances of battler mutation for abilities (#7250) 2025-07-01 19:48:12 +02:00
Alex
10e55bd18d
Fixes Life Dew playing anim when it is not supposed to + tests (#7239) 2025-07-01 17:49:31 +02:00
Alex
89b1a45536
Fixes Ice Spinner and Steel Roller (#7259) 2025-07-01 15:39:22 +01:00
Alex
5451e40830
Fixes Toxic Thread animation not being played at the right time (#7247)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-06-30 21:41:29 +02:00
Eduardo Quezada
7a0cbc12d2
Added CRY_MODE_DYNAMAX (#6933) 2025-06-30 09:45:09 -07:00
GriffinR
0c7c81e02f
Merge branch 'master' into _pret/pr/pyramidLocation 2025-06-30 11:51:45 -04:00
ghoulslash
21ac62f781
Flush textbox for Truant Popup (#7252)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-06-29 21:38:52 +02:00
PhallenTree
6ed4f73f6a
Fixes Emergency Exit sometimes causing an unrelated battler to become invisible (#7241) 2025-06-28 23:20:40 +02:00
psf
b60c897b4a
Add P_ASK_MOVE_CONFIRMATION (#7132) 2025-06-27 10:11:41 +02:00
Eduardo Quezada
57da4617da Ability status immunity 2025-06-26 17:44:29 -04:00
PhallenTree
a82aa618fb
Adds Ability Shield activation message (#7224) 2025-06-26 14:42:32 +02:00
Alex
2531613a52
Fixes Eject Pack not resolving correctly during switch in effects (#7002) 2025-06-25 21:15:40 +02:00
Bivurnum
c6221fa50e
Add debug options for follower NPCs (#7215) 2025-06-25 21:13:43 +02:00
Alex
773ecd4c24
Fixes OOB for Teatime and Flower Shield (#7214) 2025-06-25 21:00:49 +02:00