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
Alex
c120fa71dc
Fixes Ally Switch in multi battles ( #7109 )
2025-06-13 15:18:27 +02:00
PhallenTree
a000a743df
Fix typos and some cleanup (mainly in battle files) ( #7107 )
2025-06-13 14:12:13 +02:00
Alex
020be9d5b0
Deprecate sStatusFlagsForMoveEffects ( #7063 )
2025-06-05 14:32:28 +02:00
Alex
177fa2f096
Combines Super Fang and Guardian of Alola effects ( #7048 )
2025-06-03 10:26:25 +02:00
Alex
ede15918cf
Refactors Final Gambit + Tests ( #7005 )
2025-05-31 15:52:53 +02:00
cawtds
21499cbee1
Refactor field moves ( #6660 )
2025-05-31 09:03:12 +02:00
Bivurnum
37669e62ae
Bug fix: setfollowernpc macro no longer runs when FNPC_ENABLE_NPC_FOLLOWERS is FALSE ( #6755 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-05-30 17:41:02 +02:00
Hedara
9d80ad530d
Merge branch 'master' into master-to-upcoming
...
Conflicts:
Makefile
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
data/maps/MtChimney/scripts.inc
data/maps/MtPyre_Summit/scripts.inc
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
include/constants/event_objects.h
include/constants/expansion.h
src/battle_script_commands.c
src/battle_util.c
src/field_screen_effect.c
2025-05-28 14:26:15 +02:00
Alex
c489d36fc6
Fixes Gen3 berry activation timing ( #6993 )
2025-05-27 23:36:00 +02:00
Hedara
c27930eabf
Merge commit '678fdf9' into pret-merge
...
Conflicts:
data/maps/BirthIsland_Exterior/scripts.inc
data/maps/DesertUnderpass/scripts.inc
data/maps/Route117/scripts.inc
data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
data/maps/SootopolisCity/scripts.inc
include/constants/event_objects.h
src/battle_setup.c
src/event_object_movement.c
src/field_control_avatar.c
src/item_use.c
src/scrcmd.c
tools/mapjson/mapjson.cpp
2025-05-27 19:22:40 +02:00
GriffinR
0c32d840fa
Merge pull request #2141 from pret/porymap-6
...
Update for Porymap 6
2025-05-27 10:53:17 -04:00
AlexOn1ine
b90fdd1b3c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
Bassoonian
812bde8a48
Pret merge (24th of May, 2025) ( #6978 )
2025-05-25 23:08:37 +02:00
Vex
7b686b6749
Fix Wish healing even if the target is Heal Blocked ( #6979 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-05-25 23:01:11 +02:00
