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)
CI / build (push) Has been cancelled
|
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
CI / build (push) Has been cancelled
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 |
|
PhallenTree
|
014f289ea9
|
Fixes Round and Fusion moves doubling power from previous turn's move (#7476)
|
2025-08-04 12:41:43 +02:00 |
|
Alex
|
3841fee888
|
Clean up noResultString (#7408)
|
2025-08-02 15:17:44 +02:00 |
|
Linathan
|
9faa5294ce
|
Wild Pokémon animate after breaking out of Poké Ball (#7339)
|
2025-08-01 18:14:42 +02:00 |
|
Nephrite
|
73fd567520
|
Additional effects tweak (#7392)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-08-01 18:13:23 +02:00 |
|
AlexOn1ine
|
bc73f4654b
|
merge master 31/07/25
|
2025-08-01 12:18:11 +02:00 |
|
Alex
|
cb4450efaf
|
Fixes Effect Spore and Baneful Bunker/Burning Bulwark (#7412)
|
2025-07-30 19:54:12 +02:00 |
|
Eduardo Quezada
|
d801556a97
|
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727
|
2025-07-27 11:59:07 -04:00 |
|
Eduardo Quezada
|
cf4bb3e286
|
Moved some fields to BattlerState/PartyState (#7409)
|
2025-07-25 22:16:35 +02:00 |
|
Alex
|
e7cf162180
|
Fixes various Choice lock issues (#7383)
|
2025-07-25 10:18:30 -04:00 |
|
Alex
|
845838bbc0
|
Fixes bug for affectionScore in doubles for spread moves (#7395)
|
2025-07-25 09:32:45 -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 |
|
Alex
|
d5c1d3322c
|
Fixes Status overwrites and Effect Spore wrong func args (#7340)
|
2025-07-15 17:52:44 +02:00 |
|
AlexOn1ine
|
674d46bb0f
|
Fixes incorrect recoil damage after a berry was eaten
|
2025-07-15 15:37:23 +02:00 |
|