1586 Commits

Author SHA1 Message Date
Alex
f671b130a6
Fixes Beat Up incorrect slots usage (#7741) 2025-09-17 11:40:40 +02:00
Alex
74de29a921
Bugfixes Batch (#7739) 2025-09-16 19:44:06 +02:00
Eduardo Quezada
deaf77f619
Fix most failed and assume fail tests with GEN_LATEST = GEN_6 (#7696) 2025-09-14 20:21:38 +02:00
Alex
2f22780c17
Fixes Uproar not waking up mons (#7714) 2025-09-12 17:42:41 +02:00
Alex
ffd71b5337
Fixes incorrect ending for some scripts (#7691)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-09-10 22:16:47 +02:00
PhallenTree
827dd4a67c
Fixes Intrepid Sword/Dauntless Shield boosting after entering while at max stats (#7716) 2025-09-10 16:38:09 +02:00
Alex
7a0e5046d1
Fixes Rage Fist for gen7 Disguise (#7692) 2025-09-08 11:56:31 +02:00
Alex
92ba0d813d
Fixes Sweet Veil not protecting sleep from Yawn status (#7704) 2025-09-08 11:51:22 +02:00
Eduardo Quezada
1e6a533131
Fix most failed tests with GEN_LATEST = GEN_7 (#7688) 2025-09-03 19:23:23 +02:00
AlexOn1ine
1131b205f2 conflicts 2025-08-28 14:09:38 +02:00
Alex
a45d36d90f
The original attacker wasn't restored for Doodle (#7620)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-08-26 22:16:57 +02:00
AlexOn1ine
ce52d83343 25/08/25 Master merge 2025-08-25 17:30:38 +02:00
Alex
6df3a48ca2
Fixes octolock not ending after user switched out (#7556)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-08-25 15:46:36 +02:00
Hedara
da77dba59f Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
	data/battle_scripts_1.s
	include/constants/battle.h
	src/battle_script_commands.c
	src/battle_util.c
2025-08-21 15:40:38 +02:00
hedara90
95eb3ba1a7
Fix B_ANIMATE_MON_AFTER_KO with a new counter (#7531)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2025-08-21 14:43:41 +02:00
Alex
208f97e1e3
Rename passive damage hitmarker (#2174) 2025-08-21 13:43:19 +01:00
RavePossum
2d9dc28b7a
Fix in-game partner battles always causing a whiteout (#7587) 2025-08-21 12:44:15 +02:00
PhallenTree
c6ee7feaa3
Fixes some Ability Shield interactions (#7532) 2025-08-12 15:45:02 +02:00
ghoulslash
18363207d9
Fix Mimicry Only Activating Once per Turn (#7537)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-08-12 15:40:10 +02:00
Alex
f4c91b5539
Convert statuses3 to volatiles (#7514) 2025-08-11 23:19:36 +02: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
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
Alex
ed44da8644
Add a heal animation to Hospitality recovery (#7426) 2025-08-02 11:56:00 +01: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
PhallenTree
8bfc5b3093
Fixes Razor Wind not activating after hit effects after the first target (#7413) 2025-07-28 14:21:12 +02: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
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
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
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
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
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