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
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
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
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
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
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
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
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
Hedara
a714779928
Merge commit '74bf498' into pret-merge
2025-05-23 17:35:13 +02:00
Bassoonian
54806c8838
Add no-whiteout feature ( #6795 )
2025-05-17 11:20:35 +02:00
Martin Griffin
54e9505d2b
Warn on suspicious setvar usages
2025-05-15 09:42:59 +01:00
GriffinR
929bc8b990
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
2025-05-14 11:50:11 -04:00
Eduardo Quezada
3ef61e6451
Combined type-enhancing hold effects ( #6846 )
2025-05-14 13:45:08 +02:00
Ruby
2740fdd6e6
Timemacros ( #6696 )
2025-05-11 12:34:54 +02:00
Alex
4342bfb91d
Refactor stockpile resets ( #6810 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-05-10 20:09:38 +02:00
Alex
6fe5f6530a
General MoveEnd clean up and Fell Stinger adjustments ( #6674 )
2025-05-07 00:30:43 +02:00
Bivurnum
668cd7e413
Rename follower npc macros for better specificity and to match documentation ( #6742 )
2025-05-02 21:08:42 +02:00
Alex
4ff2f3de42
Centralizes non volatile status effect checks ( #6533 )
...
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-04-30 11:34:19 -04:00
Hedara
0eeba00d1b
Merge branch 'master' into master-upcoming-2025-04-30
...
Conflicts:
include/battle.h
include/constants/expansion.h
include/graphics.h
src/battle_bg.c
src/battle_util.c
src/data/graphics/battle_terrain.h
src/data/graphics/pokemon.h
src/pokeblock_feed.c
src/pokemon_sprite_visualizer.c
2025-04-30 15:22:37 +02:00
Hedara
4873589c65
Merge remote-tracking branch 'pret/master' into new-pret-merge
...
Conflicts:
asm/macros/battle_script.inc
data/battle_anim_scripts.s
include/battle.h
include/battle_controllers.h
include/battle_setup.h
include/constants/battle.h
src/battle_anim_normal.c
src/battle_anim_utility_funcs.c
src/battle_bg.c
src/battle_controllers.c
src/battle_main.c
src/battle_script_commands.c
2025-04-29 20:27:33 +02:00
hedara90
5dfbdf56da
27/04/25 Master to upcoming merge ( #6701 )
2025-04-27 18:01:50 +02:00
Bivurnum
47723c34e5
Follower NPCs (follow-me) ( #6500 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-27 14:56:18 +02:00
AlexOn1ine
e246b20e72
27/04/25 Master to upcoming merge
2025-04-27 09:50:25 +02:00
Ruby
aba34015db
Time menu for RTC in debug menu. ( #6634 )
...
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-23 19:34:37 +02:00
Alex
dfb1cd2ec0
Refactor hit escape moves to use moveend ( #6671 )
2025-04-21 22:52:55 +02:00
Alex
d220459a01
Fixes Intimidate / Eject Pack interaction ( #6645 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-21 17:33:29 +02:00
AlexOn1ine
e2e012c3a9
conflicts
2025-04-21 15:50:57 +02:00
cawtds
0069ec1f0c
Fix captivate-oblivious interaction and related test ( #6653 )
2025-04-21 11:01:01 +02:00
ghoulslash
81ed774c00
EndTurnEffectOrder Refactor ( #6224 )
2025-04-14 10:57:34 -04:00
GriffinR
709cfa1c9a
Merge pull request #2014 from Bassoonian/battleterrain
...
Rename battle terrain to environment
2025-04-13 19:32:06 -04:00
Hedara
9afd8800f3
Merge branch 'upcoming' into merrps-dns
2025-04-12 16:33:02 +02:00
Alex
4aca2fdcd3
Refactor fixed damage moves ( #6449 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-10 15:01:02 +02:00
Hedara
e419606a10
Merge branch 'upcoming' into merrps-dns
2025-04-09 12:48:18 +02:00
Hedara
2210e2d410
Merge branch 'master' into upcoming-master
2025-04-09 11:06:38 +02:00
Hedara
08a2ad2c98
Merge branch 'upcoming' into merrps-dns
2025-04-09 10:01:51 +02:00
AlexOn1ine
e8cc3c81f8
conflicts
2025-04-06 14:59:12 +02:00
