surskitty
|
c5fff74ec4
|
Toxic thread uses light screen's scoring.... (#7674)
|
2025-09-05 22:41:40 +02:00 |
|
grintoul
|
6e18c2f06e
|
Tidy up CanTargetFaintAiWithMod and CanTargetMoveFaintAi (#7693)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-09-04 15:18:51 +02:00 |
|
Eduardo Quezada
|
1e6a533131
|
Fix most failed tests with GEN_LATEST = GEN_7 (#7688)
|
2025-09-03 19:23:23 +02:00 |
|
Eduardo Quezada
|
f39fdf57cf
|
Fixed disabled cross-evolutions still being possible (#7678)
|
2025-09-02 15:46:48 +02:00 |
|
surskitty
|
84f5aa6dae
|
Helping Hand bugfix; used FOE instead of BATTLE_OPPOSITE. (#7659)
|
2025-09-01 21:43:04 +02:00 |
|
Frank DeBlasio
|
674cd13659
|
Added sortType to Douse Drive (#7664)
|
2025-08-31 20:53: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
|
ce77c48142
|
remove unused var
|
2025-08-28 14:23:44 +02:00 |
|
AlexOn1ine
|
1131b205f2
|
conflicts
|
2025-08-28 14:09:38 +02:00 |
|
ghoulslash
|
de790e4815
|
Ally Switch attract battler swapping, test for leech seed (#7634)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-08-28 13:51:02 +02:00 |
|
PhallenTree
|
f0bd3d544e
|
Fixes Wonder Room interactions with Defense/Special Defense boosting effects (#7626)
|
2025-08-27 16:16:11 +02:00 |
|
RavePossum
|
2fbf45d057
|
Restore X item friendship increase (#7583)
|
2025-08-26 22:17:30 +02:00 |
|
psf
|
8044255fee
|
Fix Vs Seeker Trainer Battle script issue (#7615)
|
2025-08-26 15:25:18 +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 |
|
RavePossum
|
0a3c281cdd
|
Fix terastallization anims flickering (#7613)
|
2025-08-25 11:48:52 +02:00 |
|
Alex
|
ff3e8da007
|
Minor Clean up in battle_ai_main.c (#7551)
|
2025-08-25 11:46:23 +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
|
e3178d3ff6
|
Fix duplicate switch in after faint (#7600)
|
2025-08-24 13:06:13 -04:00 |
|
FosterProgramming
|
1e6bb4f47c
|
Fix overlap between spin evolution and script evolution (#7593)
|
2025-08-22 20:23:18 +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 |
|
PhallenTree
|
553e5bd09c
|
Fixes refusing to replace a move on evolution causing a softlock (#7585)
|
2025-08-20 18:26:48 +02:00 |
|
grintoul
|
888783aaa5
|
Restore AI: Basic Trainer to PARTNER_STEVEN (#7586)
|
2025-08-20 10:22:19 -04:00 |
|
Eduardo Quezada
|
96653e704e
|
Fixed Teleport's description not being updated based on B_TELEPORT_BEHAVIOR (#7580)
|
2025-08-19 14:39:20 +02:00 |
|
RavePossum
|
cc705a580d
|
Fix Form Change Item Task Data and Clean Up Field Use Funcs (#7535)
|
2025-08-19 08:57:35 +02:00 |
|
Alex
|
554c909983
|
Fixes Counter / Mirror Coat / Metal Burst damage assignment (#7538)
|
2025-08-19 08:56:21 +02:00 |
|
khbsd
|
82bf955e35
|
fix: remove unused wild_encounters.json.txt jinja file (#7581)
|
2025-08-19 08:54:43 +02:00 |
|
Eduardo Quezada
|
6c261fe416
|
Fixed compile issue in gcc 11 (#7579)
|
2025-08-18 21:09:09 +02:00 |
|
Pawkkie
|
e60b9e979f
|
Fix wrong battler argument in GetBattleMovePriority call (#7576)
|
2025-08-18 19:45:41 +02:00 |
|
Pawkkie
|
5c70eeb7ed
|
Fix switch AI not seeing its own move PP (#7578)
|
2025-08-18 19:45:18 +02:00 |
|
Eduardo Quezada
|
7d459fd6dc
|
Fixed Transistor damage calculation test failing when GEN_LATEST is less than GEN_9 (#7577)
|
2025-08-18 19:44:43 +02:00 |
|
hedara90
|
60f5f3302d
|
Fix tossing a stack of berries hiding following berries (#7571)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-08-17 21:49:53 +02:00 |
|
surskitty
|
f998ec8ea8
|
Incorrect call in Rest (#7569)
|
2025-08-17 09:14:18 +02:00 |
|
Ruby
|
d5ada82455
|
Moved summary screen nature colors to summary_screen.h (#7560)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-08-15 19:33:39 +02:00 |
|
Eduardo Quezada
|
4986e06cae
|
Fixed B_PSYWAVE_DMG (#7557)
|
2025-08-15 09:03: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 |
|
surskitty
|
0a8c8ad338
|
AI handling for Howl. (#7549)
|
2025-08-13 21:31:05 +02:00 |
|
surskitty
|
45a7c13656
|
Slight Purify adjustment for targeting ally; test that AI can use Purify. (#7553)
|
2025-08-13 21:30:03 +02:00 |
|
surskitty
|
0ab811a239
|
AI uses Stuff Cheeks; treating it simply as a def +2 move for now. (#7554)
|
2025-08-13 21:29:23 +02:00 |
|
surskitty
|
2967074342
|
AI handling for Autotomize. (#7550)
|
2025-08-13 18:06:16 +02:00 |
|
surskitty
|
260b12337e
|
Helping Hand logic (#7504)
|
2025-08-13 16:21:13 +02:00 |
|