Alex
cb0d503f66
Decouple passive hp updates from move damage updates ( #7942 )
2025-10-19 16:40:13 +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
Hedara
da77dba59f
Merge remote-tracking branch 'pret/master' into pret-merge
...
Conflicts:
data/battle_scripts_1.s
include/constants/battle.h
src/battle_script_commands.c
src/battle_util.c
2025-08-21 15:40:38 +02:00
Ruby
7b8edfa631
Added comment in event.inc for simple menus in dynmultichoice ( #7568 )
2025-08-17 21:50:23 +02:00
ghoulslash
18363207d9
Fix Mimicry Only Activating Once per Turn ( #7537 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-08-12 15:40:10 +02:00
Alex
f4c91b5539
Convert statuses3 to volatiles ( #7514 )
2025-08-11 23:19:36 +02:00
Alex
acc82e7d79
Convert Status4 to volatiles ( #7411 )
...
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-08-05 19:28:33 +02:00
Josh
65f9c04757
Key split restructure ( #2168 )
...
Key split tables have been given names based on usage (KeySplitTable1 -> keysplit_piano etc) and a new macro has been set up to better represent the individual bytes for key splits with it being more obvious to how said bytes are used for the respective voice in the voicegroup.
---------
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2025-08-02 02:11:50 +01:00
Linathan
9faa5294ce
Wild Pokémon animate after breaking out of Poké Ball ( #7339 )
2025-08-01 18:14:42 +02:00
AlexOn1ine
bc73f4654b
merge master 31/07/25
2025-08-01 12:18:11 +02:00
Josh
0dfec24967
Allow names for voicegroups and use a macro for use with drumsets ( #2149 )
...
mid2agb has been modified to allow more than just numbers when naming voicegroups and voicegroups have been renamed to match. A "voice_group" macro has been set up with a optional parameter for the starting note will shift the offset by the specified amount * 0xC which is the length of 1 voice in a voicegroup. All drumset voicegroups have a "starting_note" of 36.
2025-07-30 19:43:08 +01:00
Eduardo Quezada
d801556a97
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727
2025-07-27 11:59:07 -04:00
Alex
71d40cc3f1
Convert various to callnatives ( #7355 )
2025-07-18 19:12:37 +02:00
Nephrite
a1e67572b6
Replaces STATUS2 usage with volatiles in code ( #7262 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-07-11 22:53:49 +02:00
Alex
7ae97ab6e9
Refactor move Synchronise ( #7271 )
2025-07-07 13:36:21 -04:00
PhallenTree
38a3963ec2
Fix Psych Up message and cleanup and don't allow switching to self in tests ( #7277 )
2025-07-05 14:47:36 +02:00
AlexOn1ine
aa9ff53b81
master to upcoming merge
2025-07-02 10:05:31 +02:00
Alex
89b1a45536
Fixes Ice Spinner and Steel Roller ( #7259 )
2025-07-01 15:39:22 +01:00
Alex
5451e40830
Fixes Toxic Thread animation not being played at the right time ( #7247 )
...
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-06-30 21:41:29 +02:00
GriffinR
0c7c81e02f
Merge branch 'master' into _pret/pr/pyramidLocation
2025-06-30 11:51:45 -04:00
PhallenTree
a82aa618fb
Adds Ability Shield activation message ( #7224 )
2025-06-26 14:42:32 +02:00
Alex
2531613a52
Fixes Eject Pack not resolving correctly during switch in effects ( #7002 )
2025-06-25 21:15:40 +02:00
Alex
7d7ffd58ae
Fixes Booster Energy timing activation + Clean up ( #7175 )
...
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-06-25 18:20:55 +02:00
Hedara
51a5577f65
Merge branch 'master' into master-upcoming
...
Conflicts:
src/battle_controller_safari.c
src/data/moves_info.h
src/graphics.c
2025-06-25 14:17:07 +02:00
Bivurnum
bfb0c2fa73
Added createfollowernpc macro to make a new follower from a gfx id ( #7196 )
2025-06-25 10:59:25 +02:00
Hedara
726f18f360
Merge remote-tracking branch 'pret/master' into pret-merge
...
Conflicts:
asm/macros/event.inc
data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
data/scripts/trainer_hill.inc
include/graphics.h
2025-06-24 10:42:24 +02:00
Alex
66e8200d95
Use battler arguments for SetMoveEffect ( #7156 )
2025-06-23 15:26:31 +02:00
PhallenTree
98670ca30e
Fixes Neutralizing Gas leaving the field activating unsuppressable abilities again ( #7170 )
2025-06-21 00:04:01 +02:00
GriffinR
e2e3438674
Add missing uses of LOCALID_NONE for trainerbattle
2025-06-20 15:33:12 -04:00
AlexOn1ine
aabb632894
Master to upcoming merge, 20/06/25
2025-06-20 17:09:58 +02:00
PhallenTree
340d815c6d
Stat Change (Animation) Refactor ( #7144 )
2025-06-18 14:24:35 +02:00
Nephrite
06cd3af3ea
Volatile status refactoring ( #6983 )
2025-06-18 07:22:41 +02:00
Eduardo Quezada
651e87af5f
Converted Relic Song into a proper form change ( #7139 )
2025-06-17 00:02:25 +02:00
Alex
e2f0767be5
Decouple Status set by ability from SetMoveEffect ( #7125 )
2025-06-16 14:45:21 +01:00
