Martin Griffin
|
1a9fbbcfba
|
Fix copyvar with non-var argument
|
2025-11-06 14:29:09 +01:00 |
|
Alex
|
dea7d02e76
|
Adjust faint battler script (#8137)
|
2025-11-04 20:57:49 +00:00 |
|
Alex
|
41aba41838
|
Attackstring hitmarker clean up (#8136)
|
2025-11-04 18:35:48 +00:00 |
|
Hedara
|
b0ccddac69
|
Merge branch 'master' into master-to-upcoming
Conflicts:
include/constants/expansion.h
|
2025-11-03 11:11:07 +01:00 |
|
FosterProgramming
|
4d60c9e83f
|
Fix copyvar instead of setvar causing issue with LTO (#8097)
|
2025-11-01 16:42:07 +00: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 |
|
Alex
|
ff557e3d0c
|
Clean up for item hold effect refactor (#8014)
|
2025-10-30 21:07:37 +01:00 |
|
Eduardo Quezada
|
8de86ba243
|
Fixed Belly Drum/Contrary interaction at max Attack (#8078)
|
2025-10-30 17:14:07 +01:00 |
|
Alex
|
c77c624e9f
|
Fixes Gooey/Tangling Hair ability pop up triggering on Clear Body (#8083)
|
2025-10-30 16:14:03 +01:00 |
|
Martin Griffin
|
d1d5435487
|
Improve undefined map assembler messages (#2196)
|
2025-10-29 21:34:03 -04:00 |
|
Hedara
|
a2ef3284dd
|
Merge branch 'master' into master-to-upcoming
Conflicts:
data/battle_scripts_1.s
include/battle_util.h
include/constants/battle.h
src/battle_script_commands.c
src/battle_util.c
|
2025-10-29 18:42:59 +01: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 |
|
Alex
|
ea60c32fbe
|
Fixes Liquid Ooze dmg not blocked by Magic Guard (#8036)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-10-29 15:19:50 +01:00 |
|
FosterProgramming
|
fd07daf0d8
|
Fix nature power string and add support for evnvironment in tests (#8068)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-10-28 19:23:16 +01:00 |
|
Bivurnum
|
6ddabde582
|
New Feature: ORAS Dowsing (#7211)
|
2025-10-27 17:41:07 +01:00 |
|
PhallenTree
|
782c559a20
|
Fixes Ruin field statuses negation conditions + upcoming cleanup (#8042)
|
2025-10-26 22:41:16 +01:00 |
|
AlexOn1ine
|
6acabd4ba2
|
Master to upcoming merge
|
2025-10-25 16:19:32 +02:00 |
|
Alex
|
7ebb939cbc
|
Remove usage of gBattlerTarget for MirrorHerb/Opportunist (#8033)
|
2025-10-25 13:52:40 +02:00 |
|
FosterProgramming
|
b4041535cf
|
Fix battle dome bug (again) (#8007)
|
2025-10-24 18:55:32 +02:00 |
|
Alex
|
eb1be34d47
|
Fix Salt Cure script (#8005)
|
2025-10-24 18:53:53 +02:00 |
|
FosterProgramming
|
8c87522415
|
Fix toxic debris setting hazards on the wrong side when hit by an ally (#8026)
|
2025-10-24 11:50:19 +02:00 |
|
FosterProgramming
|
5348de4abb
|
Banned species list (#8003)
|
2025-10-23 21:29:33 +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 |
|
FosterProgramming
|
90c3a8cb2c
|
Fix battle dome pre round 1 waiting room (#7976)
|
2025-10-18 18:52:57 +02:00 |
|
PhallenTree
|
38221b9de5
|
Fixes Shields Down incorrectly preventing status on Minior Core form (#7968)
|
2025-10-17 20:40:37 +02:00 |
|
FosterProgramming
|
864377f99a
|
Fix Cherim and Castfrom not reverting to baseform when Teraform Zero is triggered (#7961)
|
2025-10-16 19:19:31 +02:00 |
|
AlexOn1ine
|
e365add4cf
|
15/10/25 Master to upcoming merge
|
2025-10-15 21:31:00 +02:00 |
|
hedara90
|
3939c19bb7
|
Add missing end signal for AnimTask_SetAttackerInvisibleWaitForSignal (#7950)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-10-14 18:15:08 +02:00 |
|
Alex
|
2daa8f3c88
|
Remove EffectHitSetTerrain script to use moveeffect (#7938)
|
2025-10-13 15:39:10 +02:00 |
|
Linathan
|
65dd96a043
|
Fixed an issue related to Pokemon animation bleeding into attack anim… (#7924)
Co-authored-by: LinathanZel <LinathanZel@github.com>
|
2025-10-13 14:02:47 +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 |
|
ghoulslash
|
5b84cd14bc
|
Fix Battle Anim monbg calls Part 1 (#7906)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-10-11 20:41:13 +02:00 |
|
Alex
|
798bf0a322
|
Removes a few redundant hitmarkers (#7915)
|
2025-10-11 15:03:23 +02:00 |
|
DizzyEggg
|
d646b975ae
|
Fix SmartStrike crashing the game in double battles (#7902)
|
2025-10-09 18:41:32 +02:00 |
|
PhallenTree
|
4d12c35eb3
|
Fixes Steadfast not activating + tests (#7886)
|
2025-10-08 16:01:29 +02:00 |
|
RavePossum
|
f5e3464e83
|
Fix Brine move anim and document Water Spout anim (#7865)
|
2025-10-07 22:50:16 +02:00 |
|
AlexOn1ine
|
870b93aad9
|
06/10/25 Master to upcoming merge
|
2025-10-06 19:42:42 +02:00 |
|
FosterProgramming
|
730352683c
|
Add new actions to Debug Menu (#7837)
|
2025-10-03 20:26:49 +02:00 |
|
FosterProgramming
|
2156651313
|
No bag use flag changed to a varable (#7780)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-10-01 14:51:09 +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 |
|
spindrift64
|
2231b2fdca
|
Immunity abilities trigger on turn 0 (leads) (#7814)
|
2025-09-30 19:07:23 +02:00 |
|
Alex
|
ac75fe04d8
|
Fix test exit prints for stored battlers (#7807)
|
2025-09-28 14:47:22 -04:00 |
|
Alex
|
e9911d4d19
|
Fixes inaccurate save / restore in Fling script (#7811)
|
2025-09-28 17:39:08 +02:00 |
|
AlexOn1ine
|
a4470cac2c
|
Master to upcoming merge
|
2025-09-27 22:42:53 +02:00 |
|