AlexOn1ine
f4c64a2d79
conflicts
2025-05-30 19:20:32 +02:00
Alex
213503dee9
Fixes spread move fire types not defrosting all targets ( #6998 )
2025-05-29 11:25:10 +02:00
Alex
44d9b9c9e6
Further moveend changes (move blocks) ( #6820 )
2025-05-15 12:43:50 +02:00
Eduardo Quezada
3ef61e6451
Combined type-enhancing hold effects ( #6846 )
2025-05-14 13:45:08 +02:00
Alex
6fe5f6530a
General MoveEnd clean up and Fell Stinger adjustments ( #6674 )
2025-05-07 00:30:43 +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
Alex
ae62c80d0f
Refactors faint target abilities and adds Battle Bond config ( #6519 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-02 16:00:23 +02:00
AlexOn1ine
ccebebf64f
31-03-25 Master merge
2025-03-31 18:23:46 +02:00
Alex
adf4928fe0
Fixes timesGotHit not increasing on forced switch out ( #6493 )
2025-03-29 19:33:50 +01:00
Alex
79a2ec1ce2
Fixes Emergency Exit and Eject Pack ( #6459 )
2025-03-29 14:04:01 +01:00
AlexOn1ine
3c632b8b44
19-03-25 master to upcoming merge
2025-03-19 17:12:47 +01:00
Alex
5965c08326
Create move end Sheer Force ( #6411 )
2025-03-14 20:11:42 +01:00
Alex
3def0e751b
Fixes crash damage move against absorbing abilities ( #6361 )
2025-03-09 20:54:58 +01:00
PhallenTree
e750dca08a
Reorder Dancer activation
2025-03-04 11:02:33 +00:00
Eduardo Quezada
3507862164
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-12 09:30:59 -03: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
f8c2e860d7
Remove unused PainSplit scripting global ( #6164 )
2025-02-02 14:50:39 +01: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
40ba25dd3e
Converted 2 various to callnative ( #5950 )
2025-01-05 17:47:49 +01:00
Eduardo Quezada
3bc4126558
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-28 15:28:07 -03:00
Bassoonian
5560f339d0
Remove unused various ( #5851 )
2024-12-21 20:26:46 -03:00
Eduardo Quezada
e175c5aca8
Changes Various defines to an Enum ( #5840 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-12-21 11:48:31 +01:00
Alex
f27bf843cb
Changes Various defines to an Enum ( #5839 )
2024-12-20 10:49:40 +01:00
PhallenTree
775ea3b564
Pursuit refactor ( #5707 )
2024-12-06 19:14:46 +01:00
Eduardo Quezada
e4f8b4ccf0
Addressed review changes (minus encapsulation)
2024-12-04 11:31:28 -03:00
AlexOn1ine
09c9d8a800
merge rhh/upcoming
2024-12-02 17:45:00 +01:00
Hedara
f6fdca615f
Merge branch 'master' into master-to-upcoming
2024-11-29 11:32:12 +01:00
Alex
6b170d70f1
Fixes Red Card / Eject Pack interaction ( #5724 )
2024-11-27 14:05:11 -05:00
AlexOn1ine
97b30cb712
simultaneous hp reduction
2024-11-23 08:35:01 +01:00
Alex
67c7106fee
Refactors Absorb to use Moveend ( #5670 )
2024-11-17 09:59:04 +01:00
Eduardo Quezada
e005ffb576
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-06 10:01:48 -03:00
Alex
8581646c22
Convert 3 variouses to callnatives ( #5646 )
2024-11-06 10:09:49 +01:00
Alex
dc740b4e9a
Fixes Magic Coat message ( #5645 )
2024-11-06 10:09:00 +01:00
Eduardo Quezada
ee2535be96
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-03 12:21:22 -03:00
Alex
45d063dcf8
Fixes Dragon Tail using the effect twice during a Parental Bond attack ( #5630 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-11-02 09:38:29 -03:00
Eduardo Quezada
80af2af9ad
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-03 14:33:01 -03:00
Alex
b93e58266e
Fixes recoil moves not triggering berries if possible ( #5449 )
...
* Fixes recoil moves not triggering berries if possible
* Update battle_script_commands.h
2024-10-01 10:43:58 +02:00
Eduardo Quezada
484acdc138
Convert 8 various to callnatives ( #5172 )
...
* Convert 8 various to callnatives
* Address review comments
2024-09-01 15:12:43 +02:00
Eduardo Quezada
fcdc9ed65a
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_util.c
# src/data/pokemon/species_info/gen_7_families.h
# test/battle/ability/download.c
# test/battle/ability/intimidate.c
# test/battle/ability/supreme_overlord.c
# test/battle/ability/zero_to_hero.c
# test/battle/ai/ai.c
# test/battle/move_effect/plasma_fists.c
2024-07-05 14:25:25 -04:00
DizzyEggg
d0bb03e5a9
Fix AI's right slot switching-in too early ( #4851 )
...
* apply safe switching to trainer doubles battles - with a config
* get rid of the config
* make it compile
2024-06-21 12:17:12 +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
ghoulslash
7b1248b167
add savedBattlerAttacker and stack for saved target/attacker ( #4061 )
...
* add saveattacker/savetarget stack
* add safety checks to savedAttackerCount/savedTargetCount
* add testing warnings for saveattacker/savetarget
* update frisk with saveattacker
* restoretarget at end of red card battle scripts, remove testing checks on SaveAttacker,SaveTarget
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-05-29 21:50:24 +02:00
Alex
56cee80fbf
Explosion and Mind Blown / Steel Beam refactor (CFRU port) ( #4516 )
...
* Explosion and Mind Blown / Steel Beam refactor (CFRU port)
* forgot ndebug
* Restored EFFECT_MIND_BLOWN
* requested changes
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-05-12 11:41:18 -04:00
Alex
81a73deb76
Fixes Quash ( #4419 )
...
* Fixes Quash
* Update test/battle/move_effect/quash.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Update test/battle/move_effect/quash.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-04-21 15:40:35 +02:00
