Commit Graph

74 Commits

Author SHA1 Message Date
AlexOn1ine
90eef35715 master merge 2025-07-19 17:01:18 +02:00
Alex
73a2e5104e
Bugfixes for Knock Off, Cover, Thief, Ceaseless Edge and Stone Axe (#7326) 2025-07-14 21:34:21 +02:00
AlexOn1ine
aa9ff53b81 master to upcoming merge 2025-07-02 10:05:31 +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
AlexOn1ine
aabb632894 Master to upcoming merge, 20/06/25 2025-06-20 17:09:58 +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
PhallenTree
a000a743df
Fix typos and some cleanup (mainly in battle files) (#7107) 2025-06-13 14:12:13 +02:00
Hedara
bdd7c5bfa8 Merge branch 'master' into master-merge
Conflicts:
	src/contest_painting.c
2025-06-09 23:27:18 +02:00
Linathan
dc279f14ba
Chloroblast fix (#7008) 2025-06-06 21:33:56 +02:00
Eduardo Quezada
d795de9e9d
Remove more instances of hard-coded Move IDs (#7056) 2025-06-03 23:26:48 +02:00
Alex
177fa2f096
Combines Super Fang and Guardian of Alola effects (#7048) 2025-06-03 10:26:25 +02:00
Alex
ede15918cf
Refactors Final Gambit + Tests (#7005) 2025-05-31 15:52:53 +02:00
Eduardo Quezada
edf7c67775
Remove non-volatile status EFFECTs (#6772) 2025-05-16 22:52:51 +02:00
hedara90
4d4dea1b38
Master to upcoming merge (#6868) 2025-05-16 09:37:39 +02:00
Eduardo Quezada
3056909286
Added weather accuracy move flags (#6857) 2025-05-16 07:58:40 +02:00
AlexOn1ine
35dff24c9b Master to upcoming merge 2025-05-15 20:37:27 +02:00
Alex
44d9b9c9e6
Further moveend changes (move blocks) (#6820) 2025-05-15 12:43:50 +02:00
Alex
a086d5f592
Reverts wrongly done gem fix and renames struggle effect (#6806) 2025-05-15 10:45:48 +02:00
Eduardo Quezada
face37e8f3
Battle TV expansion (#6826) 2025-05-13 15:54:54 +02:00
Alex
4ff2f3de42
Centralizes non volatile status effect checks (#6533)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-04-30 11:34:19 -04:00
Alex
dfb1cd2ec0
Refactor hit escape moves to use moveend (#6671) 2025-04-21 22:52:55 +02:00
Alex
4aca2fdcd3
Refactor fixed damage moves (#6449)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-10 15:01:02 +02:00
Bassoonian
9a23f19575
19-03-25 master to upcoming merge (#6450) 2025-03-20 09:57:05 +01:00
Alex
adc2c61fe8
Unifies dynamic move category checks (#6443) 2025-03-19 23:06:08 +01:00
AlexOn1ine
3c632b8b44 19-03-25 master to upcoming merge 2025-03-19 17:12:47 +01:00
Alex
7df3298534
Minor Recoil Effect refactor (#6409) 2025-03-14 12:43:45 +01:00
Alex
3def0e751b
Fixes crash damage move against absorbing abilities (#6361) 2025-03-09 20:54:58 +01:00
Alex
502b1c5087
Rename SetPhotonGeyser to a more general use and clean up (#6272) 2025-02-17 22:07:30 +01:00
Eduardo Quezada
3507862164 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-12 09:30:59 -03:00
Eduardo Quezada
a2ad5d2ca3
Heal Bell/Aromatherapy/Sparkly Swirl improvements and fixes (#6210) 2025-02-09 21:54:03 +01:00
Alex
de9e9af1b7
Fixes Spectral Thief stealing boost at the wrong time (#6197)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2025-02-07 16:24:05 -05:00
Eduardo Quezada
64c5113b23 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-02 14:18:13 -03:00
Alex
97d8bd2646
Fixes Dragon Tail missing timing against Rocky Helmet / Iron Barbs (#6154) 2025-01-31 22:02:26 +01:00
Eduardo Quezada
ed505cfb5f Merge branch '_RHH/master' into _RHH/upcoming 2025-01-21 19:32:51 -03:00
Alex
b2f2a8c9fb
Fixes Rapid Spin / Toxic Debris interaction (#6023)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-01-21 21:43:54 +01:00
Eduardo Quezada
3bc4126558 Merge branch '_RHH/master' into _RHH/upcoming 2024-12-28 15:28:07 -03:00
Alex
f61a0f6a30
Sheer Force fix and move effect cleanup (#5812) 2024-12-21 19:45:50 +01:00
Eduardo Quezada
0322d51887
Split "Do nothing" move effects (#5613) 2024-12-02 09:05:04 +01:00
Alex
67c7106fee
Refactors Absorb to use Moveend (#5670) 2024-11-17 09:59:04 +01:00
Eduardo Quezada
59e617b16d
Updated Wring Out effects to match Eruption effects (#5549) 2024-10-20 21:44:28 +02:00
Alex
42c43a3f8f
Adds Commander and Order Up (#5246)
* Adds Commander

* review points

* new line

* correction

* regression / double targeting still broken

* fix wrong target order

* transform fixes

* haze test

* fixes, tests

* bring back wrongly removed else if case

* Eject Pack / Button test + fix

* red card fix

* test fixes

* Fixes Tatsu being hit by multi hit move

* change transform check

* fix test + revert change

* Fix Tatsugiri attacking after freed up from Dozo in the same turn

* Dragon Darts tests

* fix test

* review comments

* assumtion in wrong file

* Order Up test fixes

---------

Co-authored-by: hedara90 <90hedara@gmail.com>
2024-09-29 22:45:50 +02:00
Sadfish the Sad
fde85e9357
some gen 9 move anims + fickle beam rework (#5159)
* new move anims + fickle beam rework

* more fickle beam changes

* removed the true for consistency

* ficklebeamboosted gets cleared now

* mortal spin and thunderclap changes

* minor mortal spin pal change

* removed hex numbers and made hard press quicker
2024-08-14 17:20:18 +02:00
sneed
6aa308e1d8
EFFECT_PHOTON_GEYSER and restored EFFECT_SHELL_SIDE_ARM work for physical moves (#4923) 2024-07-14 15:35:11 +02:00
AgustinGDLV
9797640dff
Gimmick Refactor (#4449)
* consolidated gimmick checks, triggers, communication, and activation; updated test runner

* fixed improper use of .usableGimmick

* cleaning up battle_dynamax.c, changing function args to u32s

* fixed '#ifdef TESTING' causing errors

* updated z-moves to use gimmick interface, pared down redundancies; no AI/tests

* added support for z-moves in tests, consolidated gimmick fields

* removed ShouldUseMaxMove and .usingMaxMove

* renamed TryChangeZIndicator, updated z move display

* added several z-move tests and fixed various z-move interactions; fixed z-move category calc

* fixed useless battler arg in GetTypeBasedZMove

* added basic test check for bad Z-Move or Mega usage

* reworked test runner gimmick functionality; added support for Ultra Burst + Z-Move to test Light That Burns the Sky

* fixed gimmick test logic; fixed damage category override

* fixed mega rayquaza test fail

* consolidated gimmick indicator logic; added graphics to gGimmicksInfo

* removed TeraData struct

* reimplemented AI logic for Z-Moves; no changes

* updated Z-Move and Ultra Burst trigger gfx

* added testrunner check for multiple gimmick use

* fixed duplicate z-move call in test

* reorganized data/graphics/gimmicks.h

* added signature Z-Move ability tests; implemented Guardian of Alola

* fixed bad test update

* fixed Thousand Arrows not affecting Tera Flying; clean-up

* fixed -ate tests

* fixed tera tests

* fixed tera tests really

* fixed last batch of tests

* fixed -ate mega test again

* code review

* code review pt.2

* tweaked CanTera again

* dynamax flag only required for player
2024-06-22 22:25:40 +02:00
Eduardo Quezada
06153e4280 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	include/battle.h
#	include/constants/battle_script_commands.h
#	include/constants/pokemon.h
#	src/battle_ai_util.c
#	src/battle_main.c
#	src/battle_util.c
#	test/battle/ai.c
2024-06-13 11:44:28 -04:00
Alex
9c72392891
Fixes Shell Side Arm (#4753)
* Fixes Shell Side Arm

* Fixes to random call

* hardcoded the effect to the move

* minor change

* minor change 2

* applied reviews
2024-06-12 11:21:44 +02:00
Alex
7a393a974a
Adds Dragon Darts effect (CFRU port) (#4612)
* Adds Dragon Darts effect (CFRU port)

* fix test compile

* review
2024-05-28 11:34:56 +02:00
Eduardo Quezada
80b193280d Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/battle_main.c
#	src/data/item_icon_table.h
#	src/data/pokemon/species_info/gen_9_families.h
2024-05-27 10:13:42 -04:00