Alex
|
550469891a
|
Add setpreattackadditionaleffect and use it for brick break / spectra… (#8719)
|
2026-01-12 17:13:39 +01:00 |
|
PhallenTree
|
ad6b64432e
|
Improve IsBattlerSpritePresent's alive check (#8847)
|
2026-01-09 14:59:37 +01:00 |
|
FosterProgramming
|
1dcfe54b59
|
Refactor mon generation (#8204)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2026-01-04 20:01:59 -08:00 |
|
Hedara
|
7fed5c93bb
|
Merge branch 'upcoming' into master-to-upcoming
|
2026-01-04 17:34:20 +01:00 |
|
Hedara
|
0b91e2772f
|
Merge commit '900abdb5a6aa9703c83316d4463c0ff43e57548f' into master-to-upcoming
Conflicts:
asm/macros/battle_script.inc
src/battle_script_commands.c
|
2026-01-04 17:26:53 +01:00 |
|
PhallenTree
|
a06894b5ee
|
Ability Shield allows for ability activation when obtained and Trick cleanup (#8784)
|
2026-01-04 17:23:36 +01:00 |
|
Alex
|
e04028420a
|
Further weather consolidation (#8161)
|
2026-01-03 15:39:22 +01:00 |
|
Alex
|
900abdb5a6
|
Add enum for battle script commands (#8778)
|
2026-01-03 13:52:21 +00:00 |
|
grintoul
|
e82ed111ba
|
Misc style and whitespace cleanup (#8681)
|
2026-01-02 18:01:43 +01:00 |
|
Hedara
|
addb11cfa2
|
Merge branch 'master' into master-to-upcoming
Conflicts:
include/constants/expansion.h
src/battle_script_commands.c
|
2026-01-02 11:49:03 +01:00 |
|
Hedara
|
4bdef731e4
|
Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
include/constants/battle_ai.h
src/battle_ai_script_commands.c
src/battle_gfx_sfx_util.c
src/pokemon_summary_screen.c
src/trainer_pokemon_sprites.c
|
2026-01-01 22:16:58 +01:00 |
|
AlexOn1ine
|
a1948b7c40
|
01/01/26 Master to upcoming merge
|
2026-01-01 10:24:19 +01:00 |
|
Pawkkie
|
0551fcf408
|
Add Dynamic Switch AI Function (#8629)
|
2025-12-25 02:02:01 +01:00 |
|
spindrift64
|
582a643d1f
|
fix poisons absorbing toxic spikes when fainting from other hazards (#8644)
|
2025-12-23 21:47:42 +01:00 |
|
Alex
|
4d69a7274f
|
Stockpile / WishFutureKnock / Order up clean up (#8528)
|
2025-12-22 19:57:54 +01:00 |
|
Alex
|
6681b03c9b
|
Refactor Endeavor to use DoFixedDamageMoveCalc func (#8618)
|
2025-12-22 18:33:38 +01:00 |
|
PhallenTree
|
22b78e924d
|
Counter/Mirror Coat/Metal Burst refactor (#8604)
|
2025-12-21 12:25:28 +01:00 |
|
Hedara
|
e4ae9317c9
|
Merge branch 'master' into master-to-upcoming
Manual fixes to Lunar Dance handling
Conflicts:
include/battle_util.h
src/battle_ai_main.c
src/battle_ai_switch.c
src/battle_ai_util.c
src/battle_end_turn.c
src/battle_script_commands.c
src/battle_util.c
test/battle/ai/ai_doubles.c
test/battle/move_effect/snatch.c
test/battle/spread_moves.c
|
2025-12-19 15:31:37 +01:00 |
|
Alex
|
71a1967b7b
|
Move target type refactor (#8513)
|
2025-12-18 13:12:41 +01:00 |
|
Eduardo Quezada
|
425e532afb
|
Document magic number in createspriteontargets (#8551)
|
2025-12-17 10:43:57 +01:00 |
|
Alex
|
5509268d6b
|
Fix potential bug with CanBattlerGetOrLoseItem (#8518)
|
2025-12-13 13:14:48 -05:00 |
|
Martin Griffin
|
7e2215e05a
|
waitmovementall (#8333)
|
2025-12-11 14:52:58 +01:00 |
|
Eduardo Quezada
|
04da8aa285
|
Allow Starting Statuses beyond 15 (#8485)
|
2025-12-09 16:24:23 +01:00 |
|
GriffinR
|
d8a6b72e23
|
Display error for invalid hidden item flags
|
2025-12-03 21:44:25 -05:00 |
|
Alex
|
49a18df48a
|
Refactor Fury Cutter and Rollout (#8375)
|
2025-12-02 16:45:34 +01:00 |
|
Salem
|
29f83ea5e0
|
Trainerbattle Type Differentiation (#6424)
Co-authored-by: CallmeEchoo <callmeechoo@github.com>
Co-authored-by: Your Name <you@example.com>
|
2025-12-01 19:28:09 +01:00 |
|
FosterProgramming
|
d13965fe1f
|
New debug menu actions: Give Egg and Set KO (#8330)
|
2025-12-01 14:49:35 +01:00 |
|
Alex
|
55fbbfa586
|
Move crit calculation into the damage calc (#8365)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
|
2025-11-30 13:58:51 -05:00 |
|
PhallenTree
|
1fa97941c8
|
Updated Focus Punch failure check and moved to attackcanceler (#8360)
|
2025-11-30 18:37:57 +01:00 |
|
Alex
|
f222bcaff5
|
Switch-in Events Refactor (#8128)
|
2025-11-30 08:25:20 -08:00 |
|
AlexOn1ine
|
15d9342fe5
|
30/11/25 master to upcoming merge
|
2025-11-30 14:57:50 +01:00 |
|
hedara90
|
ce858f51b2
|
27/11/25 Master to upcoming merge (#8359)
|
2025-11-27 21:07:59 +01:00 |
|
PhallenTree
|
c36fc5c4b7
|
Fixes Beak Blast burning after Beak Blast was already used (#8361)
|
2025-11-27 20:07:45 +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 |
|
AlexOn1ine
|
68300e0f9a
|
27/11/25 Master to upcoming merge
|
2025-11-27 13:39:12 +01:00 |
|
moostoet
|
fbc640d692
|
Refactor Beat Up handling for Gen 3/4 defaults, fix crit check, and expand test coverage (#8307)
|
2025-11-25 22:18:51 +01:00 |
|
FosterProgramming
|
68a974af86
|
Fix cure status item effect not working properly in doubles (#8339)
|
2025-11-24 18:34:00 +01:00 |
|
AlexOn1ine
|
aa20b2bc0f
|
master to upcoming merge
|
2025-11-22 10:39:52 +01:00 |
|
PhallenTree
|
65a5d1e7d8
|
Fixes Neutralizing Gas displaying message when exiting with multiple users (#8318)
|
2025-11-21 19:58:02 +01:00 |
|
mitsunee
|
afa42f5d29
|
Standardize spelling of "paralyze"
|
2025-11-19 21:19:15 +01:00 |
|
AlexOn1ine
|
6a28506ee2
|
19/11/25 Master to upcoming merge
|
2025-11-19 18:20:30 +01:00 |
|
AlexOn1ine
|
ba74c076f6
|
pret merge
|
2025-11-16 12:01:13 +01:00 |
|
Alex
|
e445160c92
|
Adjust Canceler naming to contain only one l (#8258)
|
2025-11-15 18:44:16 +01:00 |
|
AlexOn1ine
|
93cc143134
|
conflicts
|
2025-11-11 13:12:00 +01:00 |
|
PCG
|
d2425c1468
|
Move Relearners for TMs, Tutors and Egg moves (#8040)
Co-authored-by: khbsd <khb.dev@gmail.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-11-09 12:54:01 -08:00 |
|
FosterProgramming
|
bdaf4ae3b3
|
Fix destiny knot behavior and add tests (#8174)
|
2025-11-09 15:03:43 +01:00 |
|
grintoul1
|
c230e54678
|
Master to Upcoming merge 20251107
|
2025-11-07 22:45:57 +00:00 |
|
FosterProgramming
|
be7646b67a
|
Allow vs seekers to work with script not starting with trainerbattle (#8062)
Co-authored-by: pkmnsnfrn <pkmnsnfrn@gmail.com>
|
2025-11-06 10:16:19 -08:00 |
|
Martin Griffin
|
1a9fbbcfba
|
Fix copyvar with non-var argument
CI / build (push) Has been cancelled
|
2025-11-06 14:29:09 +01:00 |
|
Bassoonian
|
5325c275e6
|
Master to upcoming, 2025-11-03 (#8121)
|
2025-11-03 15:05:26 +01:00 |
|