Hedara
e758d55a03
Merge remote-tracking branch 'pret/master' into pret-merge
...
Manual cleanups to the Magma Storm animation and AnimTask_InvertScreenColor
Conflicts:
asm/macros/battle_anim_script.inc
data/battle_anim_scripts.s
include/constants/battle_anim.h
src/battle_anim_bug.c
src/battle_anim_dragon.c
src/battle_anim_effects_1.c
src/battle_anim_normal.c
2026-01-31 19:20:54 +01:00
Eduardo Quezada
89da62b02d
Remove trailing whitespace - Master ( #9011 )
2026-01-25 10:12:41 +01: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
900abdb5a6
Add enum for battle script commands ( #8778 )
2026-01-03 13:52:21 +00:00
cawtds
b11741855d
Add enum for battle script opcodes ( #2222 )
2026-01-02 20:19:01 +00:00
grintoul
e82ed111ba
Misc style and whitespace cleanup ( #8681 )
2026-01-02 18:01:43 +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
spindrift64
582a643d1f
fix poisons absorbing toxic spikes when fainting from other hazards ( #8644 )
2025-12-23 21:47:42 +01:00
Eduardo Quezada
425e532afb
Document magic number in createspriteontargets ( #8551 )
2025-12-17 10:43:57 +01:00
GriffinR
d8a6b72e23
Display error for invalid hidden item flags
2025-12-03 21:44:25 -05: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
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
