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 |
|
Alex
|
499e90ac4b
|
Fixes Endure and Eject Pack issues (#7687)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-09-12 18:09:46 +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 |
|
Hedara
|
468454d810
|
Merge commit '51b000860be6d26da989c8b2e51a3f66c664083e' into pret-merge
Conflicts:
src/battle_controllers.c
src/battle_gfx_sfx_util.c
|
2025-05-15 21:38:57 +02:00 |
|
Alex
|
44d9b9c9e6
|
Further moveend changes (move blocks) (#6820)
|
2025-05-15 12:43:50 +02:00 |
|
Hedara
|
1abfa7acfa
|
Merge branch 'master' into master-upcoming
Conflicts:
include/battle.h
include/constants/battle_string_ids.h
src/battle_ai_util.c
src/battle_main.c
src/battle_util.c
test/battle/ai/ai.c
|
2025-05-12 18:21:35 +02:00 |
|
Alex
|
51b000860b
|
Add BattlerId enum and document (#2135)
|
2025-05-11 07:36:39 +01:00 |
|
Alex
|
4342bfb91d
|
Refactor stockpile resets (#6810)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-05-10 20:09:38 +02:00 |
|
hedara90
|
fe2d7442af
|
Remove old slide workaround (#6754)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-03 10:54:49 +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 |
|
Hedara
|
0eeba00d1b
|
Merge branch 'master' into master-upcoming-2025-04-30
Conflicts:
include/battle.h
include/constants/expansion.h
include/graphics.h
src/battle_bg.c
src/battle_util.c
src/data/graphics/battle_terrain.h
src/data/graphics/pokemon.h
src/pokeblock_feed.c
src/pokemon_sprite_visualizer.c
|
2025-04-30 15:22:37 +02:00 |
|
Hedara
|
4873589c65
|
Merge remote-tracking branch 'pret/master' into new-pret-merge
Conflicts:
asm/macros/battle_script.inc
data/battle_anim_scripts.s
include/battle.h
include/battle_controllers.h
include/battle_setup.h
include/constants/battle.h
src/battle_anim_normal.c
src/battle_anim_utility_funcs.c
src/battle_bg.c
src/battle_controllers.c
src/battle_main.c
src/battle_script_commands.c
|
2025-04-29 20:27:33 +02:00 |
|
Alex
|
d3fe5c4640
|
Some Me First tests plus minor clean up (#6678)
|
2025-04-23 12:18:57 +02:00 |
|
AlexOn1ine
|
e2e012c3a9
|
conflicts
|
2025-04-21 15:50:57 +02:00 |
|
Alex
|
86969f9919
|
Remove HitmarkerSwapAttackerTarget (#6627)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-20 22:49:52 +02:00 |
|
Alex
|
c1f18d0765
|
Refactor protect to allow at least 126 different types of protect eff… (#6506)
|
2025-04-02 17:26:05 +02:00 |
|
Hedara
|
06d31bc8ea
|
Merge branch 'master' into final-1.10-master-upcoming-merge
|
2025-02-26 22:07:10 +01:00 |
|
hedara90
|
cf43787d72
|
Added MOVE_TARGET_OPPONENT and added it to Me First, (#6336)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-25 22:28:22 +01: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 |
|
Alex
|
765a12f520
|
Convert max effects to normal move effects (#6143)
|
2025-02-06 21:02:39 -03:00 |
|
Salem
|
01e8d8233e
|
Trainer Battle Parameter Consolidation (#5982)
|
2025-01-25 22:02:39 +01:00 |
|
Bassoonian
|
a1c47a931f
|
Revert "Converts a bunch of defines to enums" (#6082)
|
2025-01-22 21:50:39 +01:00 |
|