AlexOn1ine
|
15d9342fe5
|
30/11/25 master to upcoming merge
|
2025-11-30 14:57:50 +01:00 |
|
Hedara
|
bf1dd201d3
|
Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
INSTALL.md
asm/macros/battle_script.inc
data/battle_scripts_1.s
include/constants/battle.h
src/battle_script_commands.c
src/battle_util.c
|
2025-11-30 11:56:57 +01:00 |
|
Alex
|
dfd8daac2e
|
Fixes Neutralizing Gas / Mold Breaker / Dragon Darts interaction (#8389)
|
2025-11-30 09:10:43 +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 |
|
psf
|
1ea0500b95
|
Fixed broken friendship from items in battle test and added new test for opposite case (#7872)
|
2025-11-24 06:55:30 +00:00 |
|
FosterProgramming
|
a4482f0ee2
|
Rework switch AI and add more tests for ace pokemon flags (#8321)
|
2025-11-23 19:04:44 +01:00 |
|
PhallenTree
|
10ef7f7839
|
More Neutralizing Gas cleanup (#8335)
|
2025-11-23 17:29:50 +01:00 |
|
moostoet
|
935817bf37
|
Fix Protosynthesis stat boosts ignoring speed drops (#8277)
|
2025-11-23 16:31:19 +01:00 |
|
Alex
|
c2fba193a6
|
Fix Upper Hand failure still activating Protean (#8329)
|
2025-11-23 12:36:28 +01:00 |
|
Eduardo Quezada
|
51a750e61a
|
Finished fixing tests when setting GEN_LATEST to GEN_5 (#8263)
|
2025-11-23 12:04:36 +01:00 |
|
AlexOn1ine
|
aa20b2bc0f
|
master to upcoming merge
|
2025-11-22 10:39:52 +01:00 |
|
FosterProgramming
|
29ac028c9e
|
Fix tossing items applying to the wrong stack (#8282)
|
2025-11-21 22:13:15 -08:00 |
|
hedara90
|
2f5dfa99f4
|
Make gTestRunnerHeadless into a constant outside of tests (#8306)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-11-20 22:14:34 +01:00 |
|
hedara90
|
cd6d293ad1
|
Fix some move animations leaking VRAM and freeing already freed tags (#7977)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-11-20 14:19:48 +01:00 |
|
mitsunee
|
c0569cd529
|
Standardize spelling of "synchronize"
|
2025-11-19 21:14:45 +01:00 |
|
AlexOn1ine
|
6a28506ee2
|
19/11/25 Master to upcoming merge
|
2025-11-19 18:20:30 +01:00 |
|
AlexOn1ine
|
6aa84c8fa1
|
Canceller -> Canceler rename
|
2025-11-19 16:06:52 +01:00 |
|
moostoet
|
8c2d31b792
|
Add AI flag AI_FLAG_KNOW_OPPONENT_PARTY to know all species in party (#8290)
|
2025-11-18 23:41:04 +01:00 |
|
moostoet
|
0f4d325467
|
Fix Fur Coat affecting confusion self-damage (#8267)
|
2025-11-18 23:34:36 +01:00 |
|
FosterProgramming
|
4a69268bd5
|
Make rainbow effect anim change based on side (#8269)
|
2025-11-18 23:31:47 +01:00 |
|
Eduardo Quezada
|
0dd73131d0
|
Test type enum indentation
|
2025-11-17 09:15:45 -03:00 |
|
Bivurnum
|
48f15b14a2
|
Follower NPCs no longer move if the player would be forced back onto the same tile. (#8260)
|
2025-11-16 21:15:06 +01:00 |
|
Alex
|
e445160c92
|
Adjust Canceler naming to contain only one l (#8258)
|
2025-11-15 18:44:16 +01:00 |
|
mitsunee
|
73ec0813e1
|
Standardize spelling of "canceler"
just a quick grep -r and regex substitution, but didn't see anything wrong in the diffs during a quick proofread
|
2025-11-15 12:11:32 +01:00 |
|
Zimmermann Gyula
|
772abe6e7d
|
Implement GSC berry/apricorn tree functionality. (#7777)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-11-14 20:28:55 +01:00 |
|
Frank DeBlasio
|
ca575f2701
|
Added Gen 6 contest combos (#8251)
|
2025-11-14 18:24:33 +01:00 |
|
Frank DeBlasio
|
1683b1ff59
|
Converted options text into COMPOUND_STRINGs (#8248)
|
2025-11-14 18:23:33 +01:00 |
|
Alex
|
0384b573d2
|
Moves name box configs into a new file (#8250)
|
2025-11-14 18:21:59 +01:00 |
|
Linathan
|
8c83a25676
|
Fixed an issue related to same turn Encore targeting (#8230)
Co-authored-by: LinathanZel <LinathanZel@github.com>
|
2025-11-13 11:37:17 +01:00 |
|
Frank DeBlasio
|
6d09eb2402
|
Added contest config and cleaned up contest category variables (#8178)
|
2025-11-13 11:29:38 +01:00 |
|
Martin Griffin
|
12b65b565b
|
DamageContext: chosenMove (#8224)
|
2025-11-11 21:59:18 +01:00 |
|
FosterProgramming
|
44d4e0c1de
|
Refactor random functions to be runner specific (#7816)
|
2025-11-11 20:48:41 +00: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 |
|
Eduardo Quezada
|
2dc36a8ba0
|
Wrote some missing tests (#8203)
|
2025-11-11 13:52:24 +01:00 |
|
AlexOn1ine
|
93cc143134
|
conflicts
|
2025-11-11 13:12:00 +01:00 |
|
PhallenTree
|
649798449e
|
Powder Move blocking cleanup (#8194)
|
2025-11-10 21:01:35 +01:00 |
|
Alex
|
226fd60674
|
Fix incorrect comments (#8193)
|
2025-11-10 15:55:58 +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 |
|
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
|
3e583f8add
|
Fix tera tint not applying on activation (#8135)
|
2025-11-09 18:10:44 +01:00 |
|
FosterProgramming
|
43f9a78da5
|
Fix recharge moves + add recharge move tests (#8181)
|
2025-11-09 17:46:22 +01:00 |
|
khbsd
|
f8509c3e65
|
Sets instant text speed flag to false by default (#8179)
|
2025-11-09 10:14:22 +01:00 |
|
khbsd
|
82a63a09fe
|
update: time-based encounters system tuneup and @cawtds' header script (#8158)
|
2025-11-07 21:25:09 -08:00 |
|
grintoul1
|
c230e54678
|
Master to Upcoming merge 20251107
|
2025-11-07 22:45:57 +00:00 |
|