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 |
|
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
|
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 |
|
Alex
|
8613d2587e
|
Deprecate various macro (#8092)
|
2025-11-03 15:03:25 +01:00 |
|
Hedara
|
b0ccddac69
|
Merge branch 'master' into master-to-upcoming
Conflicts:
include/constants/expansion.h
|
2025-11-03 11:11:07 +01:00 |
|
Hedara
|
5c31b58b81
|
Merge commit 'd1d543548772cbdf087c5ccc1e0b19980aa9ad87' into pret-merge
Conflicts:
spritesheet_rules.mk
tools/mapjson/mapjson.cpp
|
2025-11-01 15:13:16 +01:00 |
|
AlexOn1ine
|
d4e7e7ad36
|
10/11/25 Master to upcoming merge
|
2025-11-01 11:54:17 +01:00 |
|
Alex
|
1c1a98ee45
|
Grudge, Destiny Bond and FaintBattler refactor (#8072)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-10-30 23:14:02 +01:00 |
|
Eduardo Quezada
|
8de86ba243
|
Fixed Belly Drum/Contrary interaction at max Attack (#8078)
|
2025-10-30 17:14:07 +01:00 |
|
Martin Griffin
|
d1d5435487
|
Improve undefined map assembler messages (#2196)
|
2025-10-29 21:34:03 -04:00 |
|
Alex
|
dd875b87bc
|
Combine Simple Beam and Worry Seed into one effect (#8039)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-10-29 15:20:12 +01:00 |
|
Bivurnum
|
6ddabde582
|
New Feature: ORAS Dowsing (#7211)
|
2025-10-27 17:41:07 +01:00 |
|
AlexOn1ine
|
6acabd4ba2
|
Master to upcoming merge
|
2025-10-25 16:19:32 +02:00 |
|
Alex
|
786859b6bb
|
Fix Fling Mental Herb message (#7984)
|
2025-10-19 22:38:27 +02:00 |
|
Alex
|
cb0d503f66
|
Decouple passive hp updates from move damage updates (#7942)
|
2025-10-19 16:40:13 +02:00 |
|
FosterProgramming
|
4816fe02c2
|
Bugfix hidefollower not waiting properly (#7768)
|
2025-10-19 16:39:07 +02:00 |
|
PhallenTree
|
38221b9de5
|
Fixes Shields Down incorrectly preventing status on Minior Core form (#7968)
|
2025-10-17 20:40:37 +02:00 |
|
AlexOn1ine
|
e365add4cf
|
15/10/25 Master to upcoming merge
|
2025-10-15 21:31:00 +02:00 |
|
FosterProgramming
|
daf642fdbf
|
Fix multiple battle arena bugs (#7941)
|
2025-10-13 13:12:50 +02:00 |
|
Alex
|
eee546df06
|
Item battle effect refactor (#7857)
|
2025-10-12 08:59:33 +02:00 |
|
cawtds
|
c64c276d77
|
Fixes shininess for givemon (#7847)
|
2025-10-07 23:16:48 +02:00 |
|
Bassoonian
|
6267cef403
|
Streamline tryheal macros (#7830)
|
2025-10-01 13:45:20 +02:00 |
|
Alex
|
3ea095a941
|
More White Herb fixes/clean up (#7826)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-09-30 21:16:02 +02:00 |
|
Alex
|
3c9f05b367
|
Fixes activation order for a couple abilities (#7732)
|
2025-09-27 18:47:10 +02:00 |
|
AlexOn1ine
|
bc84e6656d
|
Master to upcoming merge
|
2025-09-17 20:18:51 +02:00 |
|
Alex
|
f671b130a6
|
Fixes Beat Up incorrect slots usage (#7741)
|
2025-09-17 11:40:40 +02:00 |
|
Alex
|
32f8464fec
|
Attackcanceller fixes and improvements (#7698)
|
2025-09-16 18:00:30 +02:00 |
|
mudskipper13
|
59a214828e
|
Implement field_name_box (#7697)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-09-14 20:45:18 +02:00 |
|
Hedara
|
1ec08fbe0d
|
Merge branch 'master' into master-to-upcoming
|
2025-09-06 19:43:43 +02:00 |
|
Alex
|
0422340356
|
Refactors Attackstring and PP deduction (#7402)
|
2025-09-03 20:25:27 +02:00 |
|
Eduardo Quezada
|
1e6a533131
|
Fix most failed tests with GEN_LATEST = GEN_7 (#7688)
|
2025-09-03 19:23:23 +02:00 |
|
AlexOn1ine
|
ce52d83343
|
25/08/25 Master merge
|
2025-08-25 17:30:38 +02:00 |
|
Alex
|
6df3a48ca2
|
Fixes octolock not ending after user switched out (#7556)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-08-25 15:46:36 +02:00 |
|
FosterProgramming
|
1e6bb4f47c
|
Fix overlap between spin evolution and script evolution (#7593)
|
2025-08-22 20:23:18 +02:00 |
|