1362 Commits

Author SHA1 Message Date
Bassoonian
c34ec8956d
Master to upcoming merge, 20/06/25 (#7169) 2025-06-23 10:04:44 +02:00
Eduardo Quezada
1f8455c769
Fixed TM and Berries disappearing when sorting (#7168) 2025-06-22 20:39:13 +02:00
Eduardo Quezada
bca28b40bb
Use argument.type for EFFECT_SOAK (#7141) 2025-06-21 00:04:52 +02:00
AlexOn1ine
3a42cd84af comment test 2025-06-20 17:31:16 +02:00
AlexOn1ine
aabb632894 Master to upcoming merge, 20/06/25 2025-06-20 17:09:58 +02:00
PhallenTree
340d815c6d
Stat Change (Animation) Refactor (#7144) 2025-06-18 14:24:35 +02:00
Eduardo Quezada
9adb84b2d0
Fixed KNOWN_FAILING Tera test (#6949) 2025-06-18 11:00:42 +02:00
Eduardo Quezada
0dc01f244e
Fixed Aura Wheel KNOWN_FAILING test (#7135) 2025-06-17 20:48:03 +02:00
Eduardo Quezada
5966852f8d
Removed Mind Blown effect in favor of move flag (#7138) 2025-06-17 00:02:46 +02:00
Eduardo Quezada
651e87af5f
Converted Relic Song into a proper form change (#7139) 2025-06-17 00:02:25 +02:00
hedara90
b2a0107a68
Test runner fixes (#7100)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-15 12:02:29 +02:00
Alex
d4146afcae
Add damage context to effectiveness multiplier (#7111) 2025-06-14 11:05:14 +02:00
PhallenTree
a000a743df
Fix typos and some cleanup (mainly in battle files) (#7107) 2025-06-13 14:12:13 +02:00
Eduardo Quezada
6cb5016113
Fixed potential mismatch between players and battlers in tests (#7101) 2025-06-12 19:46:03 +02:00
hedara90
75982721cd
Fixed changed effect for Sheer Cold (#7099)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-12 10:42:42 +02:00
Pawkkie
3db12a0ae6
Haze Boosting AI Followup (#6966) 2025-06-11 18:30:22 +02:00
Eduardo Quezada
393bed069a
Wrote some missing tests (#7094) 2025-06-11 09:13:37 +02:00
Hedara
bdd7c5bfa8 Merge branch 'master' into master-merge
Conflicts:
	src/contest_painting.c
2025-06-09 23:27:18 +02:00
Alex
fd856e5068
Removes duplicate AI ability func (#7045)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-06-09 11:30:16 +02:00
Emilia Daelman
f4ff5e6d26
Feature/ai/wide guard quick guard singles (#7086)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-06-08 21:50:34 +02:00
kittenchilly
872bb8785b
Simplify white out messages (#6961) 2025-06-08 08:52:37 -07:00
PhallenTree
28d185be95
Fixes Pursuit potentially causing both battlers to switch into the same mon (#7084) 2025-06-07 23:59:44 +02:00
i0brendan0
67f7ad6b1e
[DRAFT] Fix Normalize not boosting Normal type moves if they were already Normal type (#7060)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-06-06 22:00:33 +02:00
Linathan
dc279f14ba
Chloroblast fix (#7008) 2025-06-06 21:33:56 +02:00
Alex
f374291f69
Fixes Wandering Spirit copied ability activation on fainted mon (#7066) 2025-06-05 22:47:32 +02:00
PhallenTree
b3752e13d8
Fixes Aura Wheel + Normalize and Hunger Switch while Transformed/Terastallized (#7061) 2025-06-04 21:58:10 +02:00
Eduardo Quezada
d795de9e9d
Remove more instances of hard-coded Move IDs (#7056) 2025-06-03 23:26:48 +02:00
Bassoonian
1a6ed20713
Add dedicated getter functions for Pokémon types and abilities (#7043) 2025-06-03 22:05:22 +02:00
Alex
177fa2f096
Combines Super Fang and Guardian of Alola effects (#7048) 2025-06-03 10:26:25 +02:00
Bassoonian
c5c7bb13c9
Converts a bunch of defines to enums (#7041) 2025-06-02 15:54:37 +02:00
hedara90
ec15948ea8
Put the gen 1 compression tests behind a config (#7033)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-01 20:59:00 +02:00
Alex
ede15918cf
Refactors Final Gambit + Tests (#7005) 2025-05-31 15:52:53 +02:00
jfb1337
096493aa35
AI: Add AI_SMART_TERA flag to make smarter decisions about when to terastalize. (#6705)
Co-authored-by: jfb1337 <>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-05-31 09:47:25 +02:00
cawtds
21499cbee1
Refactor field moves (#6660) 2025-05-31 09:03:12 +02:00
PhallenTree
fa342b2909
Fixes Defiant/Competitive not resetting stat change animations and stat change related cleanup (#7004) 2025-05-31 08:45:46 +02:00
hedara90
6e64f6f5ef
New sprite compressor (#5627)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: DizzyEggg
Co-authored-by: Raymond Dodge <git@rayrobdod.name>
2025-05-30 23:10:54 +02:00
AlexOn1ine
f4c64a2d79 conflicts 2025-05-30 19:20:32 +02:00
Alex
5bdab5163e
Update Supersweet Syrup with eject pack fix (#7015) 2025-05-30 11:58:32 +02:00
Alex
213503dee9
Fixes spread move fire types not defrosting all targets (#6998) 2025-05-29 11:25:10 +02:00
Raymond Dodge
e605b87722
Fix out-of-bounds in Heal Bell Cures Entire Party test (#7011) 2025-05-29 10:59:47 +02:00
Hedara
9d80ad530d Merge branch 'master' into master-to-upcoming
Conflicts:
	Makefile
	data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
	data/maps/MtChimney/scripts.inc
	data/maps/MtPyre_Summit/scripts.inc
	data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
	include/constants/event_objects.h
	include/constants/expansion.h
	src/battle_script_commands.c
	src/battle_util.c
	src/field_screen_effect.c
2025-05-28 14:26:15 +02:00
Alex
c489d36fc6
Fixes Gen3 berry activation timing (#6993) 2025-05-27 23:36:00 +02:00
ghoulslash
84118dec97
Fix heal bell test, add sparkly swirl test (#6262)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-05-26 19:45:51 +02:00
Pawkkie
99073dc9f2
Fix bad odds / defensive switchin double switch cases (#6927) 2025-05-26 16:59:25 +02:00
AlexOn1ine
b90fdd1b3c Master to upcoming merge 2025-05-26 10:41:11 +02:00
Bassoonian
812bde8a48
Pret merge (24th of May, 2025) (#6978) 2025-05-25 23:08:37 +02:00
Vex
7b686b6749
Fix Wish healing even if the target is Heal Blocked (#6979)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-05-25 23:01:11 +02:00
Pawkkie
f8b3a02f6c
Backport #6712 Fix party data assignment (#6980) 2025-05-25 10:06:49 +02:00
Alex
d0313ff323
Rename AI test (#6977) 2025-05-24 17:12:48 -04:00
Hedara
dc6e40a839 Fix tests using old item functions 2025-05-24 21:57:51 +02:00