2512 Commits

Author SHA1 Message Date
Alex
0bc3c348b4
Fixes 2 instances of global usage in the Cmd_adjustdamage loop (#7918) 2025-10-11 14:49:36 +02:00
Eduardo Quezada
13f392987a
Fix some failed and assume fail tests with GEN_LATEST = GEN_5 (#7735) 2025-10-02 13:27:06 +02:00
spindrift64
2231b2fdca
Immunity abilities trigger on turn 0 (leads) (#7814) 2025-09-30 19:07:23 +02:00
ghostyboyy97
dc6178d07a
fix (choice lock): Gorilla Tactics interactions with choice item removal (#7824)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-09-29 22:54:51 +02:00
Alex
09aa452659
Fix Throat Spray activating multiply times (#7818) 2025-09-29 19:32:11 +02:00
Alex
ac75fe04d8
Fix test exit prints for stored battlers (#7807) 2025-09-28 14:47:22 -04:00
khbsd
a4ecd7338b
fix: seen flags for first mon in enemy party (#7791)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-09-28 09:53:55 +02:00
Alex
567a1290d4
Fixes Effects activating when move wasn't successful (#7803)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-09-27 19:55:12 +02:00
Bassoonian
d1bd4edc57
Fix Forecast and Flower Gift corruption (#7796) 2025-09-25 16:03:17 +02:00
PhallenTree
58b9642cb1
Fixes Instructed moves looking at the wrong turn order number (#7788) 2025-09-24 19:11:45 +02:00
Alex
b244740f52
Fixes OHKO moves calculating accuracy twice (#7785) 2025-09-24 13:34:08 +02:00
FosterProgramming
36fae27599
Fix catch bug introduced in #7774 (#7782) 2025-09-23 17:50:48 +02:00
FosterProgramming
1d11a2cb0a
Improve how test involving ball throw work (#7774) 2025-09-22 20:44:12 +02:00
PhallenTree
5fad32decc
Fixes Helping Hand boosts not stacking with each other (#7775)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-09-22 20:00:34 +02:00
bassforte123
abc471e9bd
Fixed Ball Fetch Ability (#7764) 2025-09-21 13:16:53 +02:00
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
hedara90
f99f234237
Fix Beak Blast burning fire types (#7740)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-09-15 21:32:18 +02:00
Alex
499e90ac4b
Fixes Endure and Eject Pack issues (#7687)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-09-12 18:09:46 +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
Alex
7a0e5046d1
Fixes Rage Fist for gen7 Disguise (#7692) 2025-09-08 11:56:31 +02:00
Alex
6aead97a37
Fix incorrect wrap turn amount (#7667) 2025-09-08 11:53:05 +02:00
Eduardo Quezada
1e6a533131
Fix most failed tests with GEN_LATEST = GEN_7 (#7688) 2025-09-03 19:23:23 +02:00
hedara90
7302de4209
Replace boolean multiplications with ternaries (#7653)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-08-30 11:22:02 +02:00
AlexOn1ine
1131b205f2 conflicts 2025-08-28 14:09:38 +02:00
Bassoonian
28e7a25989
25/08/25 Master merge (#7618) 2025-08-26 15:23:24 +02:00
Alex
e2f24bbb3f
Prevents a regression for custom abilties (#7616) 2025-08-25 17:37:57 +02:00
Alex
1bb9a1c86b
Remove unused function (#7617) 2025-08-25 17:36:43 +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
Alex
53e7699649
Fixes Explosion behavior when 3 mons can endure hit (#7594) 2025-08-25 11:41:36 +02:00
ghoulslash
9b5b69ae49
switchinabilities also runs ON_WEATHER and ON_TERRAIN (#7612)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-08-25 11:40:52 +02:00
Alex
504d3bc31f
Fixes moveend_absorb hitmarker (#7591) 2025-08-21 16:49:13 +02:00
Alex
f24b919a11
Pret merge (21 of August, 2025) (#7590) 2025-08-21 16:05:50 +02:00
Alex
c0231c9bb1
Fixes Rage Fist counter increment (#7582)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-08-21 15:46:31 +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
Alex
554c909983
Fixes Counter / Mirror Coat / Metal Burst damage assignment (#7538) 2025-08-19 08:56:21 +02:00
GriffinR
92f7727a60
Merge pull request #2107 from AsparagusEduardo/pret/pr/simpleMultiBattleFix
Simplified Multi Battle bugfix, removing duplicate code
2025-08-14 15:09:42 -04:00
Alex
65b316625f
Fixes Knock Off still activating when there is no Item (#7496) 2025-08-13 15:00:04 +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
7de3663f38
Fixes Life Orb still activating if move was absorbed (#7521) 2025-08-10 16:58:36 +02:00
Linathan
89b179e4c4
Fixes draining moves recovering 1 HP when dealing 0 damage (#7523)
Co-authored-by: root <root@DESKTOP-RVGNQ5E.localdomain>
Co-authored-by: LinathanZel <LinathanZel@github.com>
2025-08-10 00:27:47 +02:00
Eduardo Quezada
0b299b3ffd
Fixed most failed tests with GEN_LATEST GEN_8 (#7498) 2025-08-08 09:44: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