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
73a2e5104e
Bugfixes for Knock Off, Cover, Thief, Ceaseless Edge and Stone Axe ( #7326 )
2025-07-14 21:34:21 +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
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
Bassoonian
a3ce3a569d
Converts a bunch of defines to enums ( #6071 )
2025-01-21 21:19:41 +01:00
Eduardo Quezada
0fefb444de
Multiple removals of hardcoded move IDs ( #5964 )
2025-01-10 17:07:32 -05:00
ghoulslash
03684c6539
Battle Weather Refactor ( #5833 )
2025-01-04 07:33:25 -05:00
Eduardo Quezada
9669a0554d
Encapsulate move data ( #5852 )
2025-01-01 20:34:33 +01:00
Eduardo Quezada
004efd1e5a
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-31 18:38:03 -03:00
Bassoonian
bf125c8f5e
Fix wrong value for NUM_MOVE_EFFECTS ( #5913 )
2024-12-30 23:51:48 +01:00
Alex
af19b13195
Adds Pledge Side Statuses as Starting Statuses ( #5899 )
2024-12-30 09:18:23 +01:00
AlexOn1ine
74f1d7cb80
merge rhh/upcomig
2024-12-28 21:03:34 +01:00
AlexOn1ine
6a906a3fc1
refactor done
2024-12-28 20:55:59 +01:00
AlexOn1ine
0bb86e4437
struct
2024-12-28 10:23:28 +01:00
Eduardo Quezada
f9fed98665
Fixed MOVE_EFFECT_FREEZE_OR_FROSTBITE not being usable in battle scripts ( #5859 )
2024-12-22 23:39:48 +01:00
Alex
f61a0f6a30
Sheer Force fix and move effect cleanup ( #5812 )
2024-12-21 19:45:50 +01:00
AlexOn1ine
573200d56a
nobody saw anything but again
2024-12-21 11:23:30 +01:00
AlexOn1ine
ff4c2aaf78
nobody saw anything
2024-12-21 10:24:34 +01:00
AlexOn1ine
71318eca5f
Revert weather order
2024-12-21 10:04:16 +01:00
AlexOn1ine
2c419ccb57
review comments
2024-12-20 22:43:05 +01:00
AlexOn1ine
eb4427db94
primal weather fix
2024-12-19 21:41:32 +01:00
AlexOn1ine
99fef0260f
Battle Weather Refactor
2024-12-19 20:50:08 +01:00
Alex
194f7644b8
Changes taget bit of Flower Shield ( #5698 )
2024-11-23 12:02:40 -05:00
Eduardo Quezada
b48e5770be
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-11 15:58:42 -03:00
Alex
b55c87f73f
Fixes Take heart ( #5658 )
...
Co-authored-by: KyleLaporte <moog272@gmail.com>
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-11-11 14:58:09 -05: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
