GGbond
|
128beb39e1
|
Fixed several issues with Parting Shot (#8928)
|
2026-01-20 22:06:50 +01:00 |
|
Alex
|
922db5ce4a
|
Move adjustdamage to the damage calc (#8948)
|
2026-01-20 12:30:00 +01:00 |
|
hedara90
|
f9c826ca57
|
Merge pull request #2228 from hedara90/fix-spaces
Fix spaces instead of tabs in battle_anim_scripts.s
|
2026-01-20 11:13:48 +00:00 |
|
Martin Griffin
|
22eed3f4bf
|
Partially document battle_anim_effects_1.c
|
2026-01-19 09:16:37 +00:00 |
|
Martin Griffin
|
0e415dde46
|
Document battle_anim_dragon.c
|
2026-01-19 09:16:37 +00:00 |
|
Martin Griffin
|
5d713ad9bb
|
Document battle_anim_dark.c
|
2026-01-19 09:16:37 +00:00 |
|
Martin Griffin
|
050a9415c7
|
Document battle_anim_bug.c
|
2026-01-19 09:16:37 +00:00 |
|
Martin Griffin
|
e09423fadf
|
Document battle_anim_normal.c
|
2026-01-19 09:16:37 +00:00 |
|
Alex
|
de7aaf854c
|
Misc battle engine changes (#8931)
|
2026-01-16 18:55:22 +01:00 |
|
FosterProgramming
|
550fe9a7de
|
Refactor pokerus and add configs (#7731)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2026-01-14 12:04:33 +01:00 |
|
Alex
|
bb41e5622c
|
Refactor move target failure (#8696)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2026-01-13 15:13:38 -08:00 |
|
Alex
|
550469891a
|
Add setpreattackadditionaleffect and use it for brick break / spectra… (#8719)
|
2026-01-12 17:13:39 +01:00 |
|
Frank DeBlasio
|
a15d9a81f9
|
Adding move animation backgrounds to the Pokemon Sprite Visualizer (#8764)
|
2026-01-11 22:59:14 +01:00 |
|
Eduardo Quezada
|
c631ea1ddd
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/masterMerge
|
2026-01-11 15:10:21 -03:00 |
|
Eduardo Quezada
|
4df79828ac
|
Merge branch '_RHH/master' into _RHH/pr/upcoming/masterMerge
|
2026-01-11 15:06:42 -03:00 |
|
Frank DeBlasio
|
e587cff9dd
|
Refactor exchange service corner (#8840)
|
2026-01-11 18:31:38 +01:00 |
|
GGbond
|
b671adf85f
|
Fixes Nightmare not affecting Comatose and adds various missing tests (#8859)
|
2026-01-11 15:02:41 +00:00 |
|
PhallenTree
|
ad6b64432e
|
Improve IsBattlerSpritePresent's alive check (#8847)
|
2026-01-09 14:59:37 +01:00 |
|
PCG
|
d34c7f0ba6
|
Refactor move relearner and small #8027 follow-up (#8675)
|
2026-01-07 14:49:39 +01:00 |
|
Frank DeBlasio
|
f6be01e92c
|
More battle environment updates (#8809)
|
2026-01-06 22:10:08 +01:00 |
|
Frank DeBlasio
|
faa779ea2c
|
Added Secret Power animations to gBattleEnvironmentInfo (#8807)
|
2026-01-05 23:03:13 +01:00 |
|
FosterProgramming
|
8c9d3b9c7a
|
Add gym leader support for vs seeker and clean vs seeker code (#8172)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2026-01-04 20:03:41 -08:00 |
|
Hedara
|
7fed5c93bb
|
Merge branch 'upcoming' into master-to-upcoming
|
2026-01-04 17:34:20 +01:00 |
|
Hedara
|
82c474bcd0
|
Merge branch 'master' into master-to-upcoming
Conflicts:
include/config/battle.h
|
2026-01-04 17:31:25 +01:00 |
|
PhallenTree
|
a06894b5ee
|
Ability Shield allows for ability activation when obtained and Trick cleanup (#8784)
|
2026-01-04 17:23:36 +01:00 |
|
PhallenTree
|
bda2064ecf
|
Fixes Chilly Reception displaying its message when called by another move (#8795)
|
2026-01-04 16:50:43 +01:00 |
|
Hedara
|
78124e88d7
|
Merge commit '0e33bf916e80e4dcf4f96ca0419a8b2fda5da51d' into master-to-upcoming
Conflicts:
src/battle_main.c
test/battle/ability/beads_of_ruin.c
test/battle/ability/commander.c
test/battle/ability/desolate_land.c
test/battle/ability/primordial_sea.c
test/battle/ability/supreme_overlord.c
test/battle/ability/sword_of_ruin.c
test/battle/ability/tablets_of_ruin.c
test/battle/ability/vessel_of_ruin.c
test/battle/ai/ai.c
test/battle/ai/ai_multi.c
test/battle/ai/ai_switching.c
test/battle/gimmick/dynamax.c
test/battle/move_effect/counter.c
test/battle/move_effect/fling.c
test/battle/move_effect/mirror_coat.c
test/battle/move_effect/misty_explosion.c
test/battle/move_effect/protect.c
test/battle/move_effect/psychic_terrain.c
test/battle/move_effect/sticky_web.c
test/battle/trainer_slides.c
|
2026-01-04 11:28:59 +01:00 |
|
Bassoonian
|
eba17e6860
|
Remove credits from code (#8748)
|
2026-01-03 18:21:13 +01:00 |
|
Alex
|
d9da5ee874
|
Fix Red Card / Eject Button interaction (#8780)
|
2026-01-03 16:54:04 +00:00 |
|
Alex
|
e04028420a
|
Further weather consolidation (#8161)
|
2026-01-03 15:39:22 +01:00 |
|
moostoet
|
1510947001
|
Fix Rage generational inaccuracies (#8642)
|
2026-01-03 08:51:31 +01:00 |
|
moostoet
|
0e33bf916e
|
Fix berry activation timing for Yawn sleep and Leech Seed damage (#8776)
|
2026-01-03 08:50:17 +01:00 |
|
Frank DeBlasio
|
667ae0cc70
|
Migrated some strings out of strings.c/strings.h (#8270)
|
2026-01-02 23:48:00 -08:00 |
|
grintoul
|
e82ed111ba
|
Misc style and whitespace cleanup (#8681)
|
2026-01-02 18:01:43 +01:00 |
|
AlexOn1ine
|
a1948b7c40
|
01/01/26 Master to upcoming merge
|
2026-01-01 10:24:19 +01:00 |
|
grintoul
|
a71fc91484
|
Trainer slides for multiple trainers and multibattles (#7588)
Co-authored-by: hedara90 <90hedara@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-12-30 20:28:53 +00:00 |
|
grintoul
|
dcc584c6d6
|
Fixes incorrect battler used in STRINGID_USEDINSTRUCTEDMOVE (#8704)
|
2025-12-29 21:57:10 +01:00 |
|
hedara90
|
f10d722af7
|
Fix Aqua Ring animation (#8707)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-12-29 21:34:06 +01:00 |
|
Alex
|
3a8fdf9fad
|
Create battle_move_resolution.c (#8703)
|
2025-12-29 16:13:45 +01:00 |
|
PhallenTree
|
d5c40bbbdd
|
Add Move End Faint Block (#8673)
|
2025-12-28 20:44:39 +01:00 |
|
FosterProgramming
|
30e5fc6958
|
Refactoring the way teachable learnsets are generated (#8027)
|
2025-12-26 13:13:29 +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
|
644b04a9f4
|
Move Explosion to attackcanceler and Terrain Boost effect (#8612)
|
2025-12-22 18:52:28 +01:00 |
|
Alex
|
6681b03c9b
|
Refactor Endeavor to use DoFixedDamageMoveCalc func (#8618)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2025-12-22 18:33:38 +01:00 |
|
PhallenTree
|
22b78e924d
|
Counter/Mirror Coat/Metal Burst refactor (#8604)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
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 |
|
hedara90
|
ada6b5e754
|
Assertf improvements and fixes (#8570)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2025-12-18 13:29:46 +01:00 |
|
FosterProgramming
|
bf0e1b1a86
|
Add missing behavior when using focus punch while surviving an OHKO move (#8484)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-12-17 00:56:59 +01:00 |
|
Alex
|
4ae2f03e02
|
Move disable struct members to battle mon volatiles (#8540)
|
2025-12-16 15:53:35 +01:00 |
|
Steve
|
1e9cddd848
|
Align gSpecialVars
|
2025-12-14 23:03:33 -05:00 |
|
Alex
|
6b83f3b7b0
|
Add starting-status hazard support (#8302)
|
2025-12-14 16:30:59 +01:00 |
|
Eduardo Quezada
|
a0a5947590
|
Added tests for stat-changing moves (#8278)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-12-14 16:24:39 +01:00 |
|
Eduardo Quezada
|
15b2544e9f
|
Fixed Wally Tutorial and added option to check from Debug Menu (#8502)
|
2025-12-14 00:34:12 -05:00 |
|
Alex
|
5509268d6b
|
Fix potential bug with CanBattlerGetOrLoseItem (#8518)
|
2025-12-13 13:14:48 -05:00 |
|
Moos Toet
|
fc2242cd68
|
Merge remote-tracking branch 'upstream/upcoming' into feat/8245-traps-starting-statuses
|
2025-12-11 23:04:07 +01:00 |
|
FosterProgramming
|
cbef5276e8
|
Fix slateport battle tent battle type (#8475)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2025-12-09 17:00:01 +01:00 |
|
AlexOn1ine
|
23cefec579
|
08/12/25 master to upcoming merge
|
2025-12-08 18:15:19 +01:00 |
|
Moos Toet
|
578d9a33b6
|
feat: add traps to starting statuses list
|
2025-12-08 14:15:29 +01:00 |
|
FosterProgramming
|
86ba8c3191
|
Fix potential issue when destiny knot fail after proccing from cute charm (#8459)
|
2025-12-07 18:35:39 +01:00 |
|
amiosi
|
328ec9d708
|
Generational Move Changes (#8405)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
|
2025-12-06 23:50:58 +01:00 |
|
Paccy
|
47e1ca999a
|
Add Chooseboxmon special (#5428)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-12-04 22:46:55 +01:00 |
|
hedara90
|
22492a6494
|
Make TRUE and 1 behave the same in config/species_enabled.h (#8421)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-12-04 15:27:50 +01:00 |
|
FosterProgramming
|
f3d43e286d
|
Fix substitute/defog interactions (#8418)
|
2025-12-04 15:24:53 +01:00 |
|
FosterProgramming
|
142a5ef08c
|
Fix illusion not breaking properly when behind substitute (#8423)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-12-04 00:35:38 +01:00 |
|
Eduardo Quezada
|
115694675f
|
Renamed Config Test system to more general names (#7283)
|
2025-12-02 11:26:44 -05:00 |
|
Alex
|
49a18df48a
|
Refactor Fury Cutter and Rollout (#8375)
|
2025-12-02 16:45:34 +01:00 |
|
Alex
|
a285482310
|
Make Glaive Rush a MOVE_EFFECT_GLAIVE_RUSH (#8351)
|
2025-12-02 16:44:31 +01:00 |
|
PhallenTree
|
1a6d03344a
|
Multiple bugfixes (mostly Dancer/called moves) (#8401)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
|
2025-12-01 20:12:11 +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 |
|
FosterProgramming
|
2a16b94a13
|
Allow x items to be cross-used in double battles (#8280)
|
2025-12-01 14:46:03 +01:00 |
|
Alex
|
55fbbfa586
|
Move crit calculation into the damage calc (#8365)
CI / build (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
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 |
|
hedara90
|
58317e35b9
|
Cawt FRLG part 1 (#8396)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-11-30 09:28:36 -08:00 |
|
hedara90
|
4d43030df2
|
Revert "Add FRLG (Part 1)" (#8395)
|
2025-11-30 09:17:24 -08:00 |
|
hedara90
|
6f207521fa
|
Add FRLG (Part 1) (#7572)
|
2025-11-30 17:29:01 +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)
CI / build (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
|
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 |
|
FosterProgramming
|
7085d30263
|
Fix substitute graphic not disappearing after using a pivor move (#8340)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
|
2025-11-27 19:09:40 +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)
CI / build (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
Docs / deploy (push) Has been cancelled
|
2025-11-25 22:18:51 +01:00 |
|
FosterProgramming
|
68a974af86
|
Fix cure status item effect not working properly in doubles (#8339)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
|
2025-11-24 18:34:00 +01:00 |
|
PhallenTree
|
10ef7f7839
|
More Neutralizing Gas cleanup (#8335)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
|
2025-11-23 17:29:50 +01:00 |
|
FosterProgramming
|
7fd0745766
|
Fix switch-in abilities not triggering on revive (#8293)
|
2025-11-23 17:04:01 +01:00 |
|
Alex
|
c2fba193a6
|
Fix Upper Hand failure still activating Protean (#8329)
|
2025-11-23 12:36:28 +01:00 |
|
Alex
|
8d3be426fd
|
Remove leftover scrtipt redirection (#8317)
|
2025-11-23 09:42:43 +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)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
|
2025-11-21 19:58:02 +01:00 |
|
FosterProgramming
|
7229305ff9
|
Fix max move message against semi invulnerable target (#8313)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-11-21 15:15:01 +01:00 |
|
FosterProgramming
|
7ec0a1db9a
|
Fix bug where defiant/competitive would pass their stat change to the next target (#8312)
|
2025-11-21 11:14:25 +01:00 |
|
FosterProgramming
|
acdfa39f76
|
Make switchout abilities trigger after a pokemon has returned to its ball (#8304)
|
2025-11-20 17:19:06 +01:00 |
|
hedara90
|
cd6d293ad1
|
Fix some move animations leaking VRAM and freeing already freed tags (#7977)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-11-20 14:19:48 +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 |
|
FosterProgramming
|
4a69268bd5
|
Make rainbow effect anim change based on side (#8269)
|
2025-11-18 23:31:47 +01:00 |
|
AlexOn1ine
|
ba74c076f6
|
pret merge
|
2025-11-16 12:01:13 +01:00 |
|