moostoet
|
d0965814fe
|
Fix Costar not copying partner's critical hit boosts (#8386)
|
2025-12-02 21:25:52 +01:00 |
|
Alex
|
2d628aca0e
|
Move end clear bits clean up (#8354)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-11-27 17:42:16 +01:00 |
|
Alex
|
bb11d96d86
|
Merge branch 'upcoming' into 111125
|
2025-11-11 19:04:54 +01:00 |
|
Alex
|
f28abcab6a
|
Micro clean up in BattleStruct (#8177)
|
2025-11-11 17:42:27 +01:00 |
|
AlexOn1ine
|
93cc143134
|
conflicts
|
2025-11-11 13:12:00 +01:00 |
|
Alex
|
59d131f599
|
Fixes wrongly assigned count for Semi Invulnerable state (#8175)
|
2025-11-10 10:40:47 +01:00 |
|
Alex
|
d9797fa01d
|
Remove redundant Future Sight flag (#8185)
|
2025-11-09 22:33:03 +01:00 |
|
FosterProgramming
|
43f9a78da5
|
Fix recharge moves + add recharge move tests (#8181)
|
2025-11-09 17:46:22 +01:00 |
|
Alex
|
0f14a4db57
|
Clean up ability effect hitmarker (#8138)
|
2025-11-04 21:44:57 +00:00 |
|
Alex
|
41aba41838
|
Attackstring hitmarker clean up (#8136)
|
2025-11-04 18:35:48 +00:00 |
|
Alex
|
80b5d81a9a
|
Create BattleStruct sub struct for event states (#8131)
|
2025-11-04 18:34:54 +00:00 |
|
Alex
|
1c1a98ee45
|
Grudge, Destiny Bond and FaintBattler refactor (#8072)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-10-30 23:14:02 +01:00 |
|
Hedara
|
a2ef3284dd
|
Merge branch 'master' into master-to-upcoming
Conflicts:
data/battle_scripts_1.s
include/battle_util.h
include/constants/battle.h
src/battle_script_commands.c
src/battle_util.c
|
2025-10-29 18:42:59 +01:00 |
|
grintoul
|
c90e6952f3
|
Fix Ally Switch being useable in Frontier Link Multi battles (#8059)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-10-28 19:26:10 +01:00 |
|
grintoul
|
95c2a6e2b6
|
Multibattle testing system (#7257)
Co-authored-by: hedara90 <90hedara@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
|
2025-10-24 15:00:23 +02:00 |
|
Bassoonian
|
fbd702e3a4
|
Some more documentation and cleanup (#8020)
|
2025-10-23 20:14:38 +02:00 |
|
Alex
|
cb0d503f66
|
Decouple passive hp updates from move damage updates (#7942)
|
2025-10-19 16:40:13 +02:00 |
|
Alex
|
798bf0a322
|
Removes a few redundant hitmarkers (#7915)
|
2025-10-11 15:03:23 +02:00 |
|
Alex
|
32f8464fec
|
Attackcanceller fixes and improvements (#7698)
|
2025-09-16 18:00:30 +02:00 |
|
Alex
|
78a05c97ac
|
Refactors ruin ability checks into a field effect (#7711)
|
2025-09-14 14:41:10 +01: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
|
0422340356
|
Refactors Attackstring and PP deduction (#7402)
|
2025-09-03 20:25:27 +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 |
|
AlexOn1ine
|
ce52d83343
|
25/08/25 Master merge
|
2025-08-25 17:30:38 +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 |
|
Alex
|
208f97e1e3
|
Rename passive damage hitmarker (#2174)
|
2025-08-21 13:43:19 +01:00 |
|
Alex
|
f4c91b5539
|
Convert statuses3 to volatiles (#7514)
|
2025-08-11 23:19:36 +02:00 |
|
Alex
|
acc82e7d79
|
Convert Status4 to volatiles (#7411)
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-08-05 19:28:33 +02:00 |
|
Alex
|
3841fee888
|
Clean up noResultString (#7408)
|
2025-08-02 15:17:44 +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 |
|
Pawkkie
|
249b4d1574
|
19/07/25 Master merge (#7375)
|
2025-07-19 19:22:48 -04:00 |
|
surskitty
|
1b996fbb8e
|
AI refactor for weather-setting, terrain-setting, Trick Room behaviors; doubles-focused (#7319)
|
2025-07-19 19:20:07 -04:00 |
|
AlexOn1ine
|
90eef35715
|
master merge
|
2025-07-19 17:01:18 +02:00 |
|
hedara90
|
2f6e1ea6d3
|
Enum conversion for enum MoveEffects and enum BattleMoveEffects (#7366)
|
2025-07-19 10:28:25 +02:00 |
|
Alex
|
73a2e5104e
|
Bugfixes for Knock Off, Cover, Thief, Ceaseless Edge and Stone Axe (#7326)
|
2025-07-14 21:34:21 +02:00 |
|
Frank DeBlasio
|
c9ec896312
|
Refactor battle environment (#4891)
|
2025-07-12 12:38:06 -04:00 |
|
Nephrite
|
a1e67572b6
|
Replaces STATUS2 usage with volatiles in code (#7262)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-07-11 22:53:49 +02:00 |
|
surskitty
|
cb03086c1d
|
AI checks the partner's moves for Flatter, Swagger, and Soak. (#7306)
|
2025-07-10 20:02:31 +02:00 |
|
Alex
|
31a561201b
|
Adds hazard queue (#7295)
|
2025-07-07 15:30:35 -04:00 |
|
Alex
|
7ae97ab6e9
|
Refactor move Synchronise (#7271)
|
2025-07-07 13:36:21 -04:00 |
|
surskitty
|
c360900a5b
|
Renaming STATUS1_REFRESH and adding more constants for common STATUS1 checks. (#7284)
|
2025-07-05 13:46:23 +02:00 |
|
Alex
|
e503f97f32
|
Use dedicated functions for Mud/Water Sport (#7248)
|
2025-07-02 09:08:12 +02:00 |
|
Alex
|
66e8200d95
|
Use battler arguments for SetMoveEffect (#7156)
|
2025-06-23 15:26:31 +02:00 |
|
Nephrite
|
06cd3af3ea
|
Volatile status refactoring (#6983)
|
2025-06-18 07:22:41 +02:00 |
|
Alex
|
e2f0767be5
|
Decouple Status set by ability from SetMoveEffect (#7125)
|
2025-06-16 14:45:21 +01:00 |
|
Bassoonian
|
c5c7bb13c9
|
Converts a bunch of defines to enums (#7041)
|
2025-06-02 15:54:37 +02:00 |
|
Hedara
|
90aed43c27
|
Merge branch 'master' into master-upcoming
Conflicts:
.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
.github/ISSUE_TEMPLATE/03_feature_requests.yaml
.github/ISSUE_TEMPLATE/04_other_errors.yaml
.github/pull_request_template.md
src/battle_controller_player.c
src/battle_main.c
src/battle_script_commands.c
src/battle_util.c
src/data/graphics/pokemon.h
src/data/pokemon/species_info/gen_9_families.h
test/battle/ability/flower_veil.c
test/battle/ability/sweet_veil.c
test/battle/ability/synchronize.c
test/battle/ability/water_bubble.c
test/battle/move_effect/fell_stinger.c
test/battle/move_effect/level_damage.c
test/battle/move_effect/magic_room.c
test/battle/move_effect/me_first.c
test/battle/move_effect/sky_drop.c
test/battle/move_effect/smack_down.c
test/battle/move_effect/wish.c
test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c
|
2025-05-22 15:41:08 +02:00 |
|
Alex
|
8ec998abff
|
Fixes ate type being ignored after checking summary screen (#6888)
|
2025-05-22 14:07:36 +02:00 |
|
AlexOn1ine
|
33607529cd
|
conflicts
|
2025-05-16 10:46:32 +02:00 |
|