RoamerX
18aeb5b256
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master
2026-02-24 12:16:36 +08:00
GGbond
8334c68422
Fix Eviolite to use original species after Transform ( #9285 )
2026-02-23 14:51:32 +01:00
luuma
cb5db2491f
Fixes Minior not appearing in Meteor form when encountered in the wild ( #9282 )
2026-02-21 17:45:32 +01:00
FosterProgramming
bc6bbb1bc5
Make sure grass effect palette ignore fog when time blended ( #9235 )
2026-02-17 13:54:36 +01:00
GGbond
acfd2f4f8c
Fix Taunt to not block Me First in Gen 5+ ( #9069 )
2026-02-10 12:05:41 +01:00
GGbond
57c51c0702
Fix Transform fail conditions with gen-specific checks ( #9070 )
2026-02-10 11:59:09 +01:00
RoamerX
af2b69f7e5
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master
2026-02-07 22:07:24 +08:00
Eduardo Quezada
32d1777b7a
Use direct config names instead of enum names ( #8824 )
2026-02-06 11:57:33 +01:00
Hedara
c8b0d1b08c
1.14.4 cycle start
2026-02-01 17:13:46 +01:00
Hedara
2d17ad27f9
Expansion 1.14.3 release
2026-02-01 17:13:23 +01:00
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
PhallenTree
022f5eb52e
Fixes Infiltrator and adds config for Substitute interaction ( #9073 )
2026-01-30 14:14:35 +01:00
GGbond
4198a5cb85
Fix Forewarn edge cases and random selection ( #9049 )
2026-01-29 13:54:28 +01:00
GGbond
aafc581460
Fix Psych Up wrong battler message and Gen 6+ crit ratio copying ( #9015 )
2026-01-27 15:44:42 +01:00
RoamerX
e94050f53c
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master
2026-01-27 12:26:20 +08:00
GGbond
21492e0f23
Fix Foresight/Miracle Eye repeated-use behavior ( #9025 )
2026-01-26 14:48:39 +01:00
khbsd
12970602ce
fix: IsDoubleBattle() return value ( #9012 )
2026-01-25 10:15:01 +01:00
Eduardo Quezada
89da62b02d
Remove trailing whitespace - Master ( #9011 )
2026-01-25 10:12:41 +01:00
GGbond
128beb39e1
Fixed several issues with Parting Shot ( #8928 )
2026-01-20 22:06:50 +01:00
Bassoonian
d12929ffbd
Pret merge (20th of January, 2026) ( #8973 )
2026-01-20 14:35:55 +01:00
hedara90
3b241b561a
Move CMD_ARGS to battle_script_commands ( #8974 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2026-01-20 14:31:36 +01:00
Hedara
594a4c7ec3
Merge commit 'dc077e50d3a2d52964a52ce9a9e81fd99586dd4f' into pret-merge
...
Conflicts:
.github/workflows/build.yml
asm/macros/battle_script.inc
include/constants/battle_script_commands.h
src/battle_controllers.c
src/battle_script_commands.c
src/data/graphics/battle_environment.h
src/party_menu.c
2026-01-19 21:40:27 +01:00
Martin Griffin
e09423fadf
Document battle_anim_normal.c
2026-01-19 09:16:37 +00:00
RoamerX
270f498300
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master
2026-01-18 19:41:13 +08:00
cawtds
7b03c2e238
Fix teleport location ( #8941 )
2026-01-17 15:48:45 +01:00
amiosi
9798b6c7d7
Changes to Item icons and palettes ( #8614 )
2026-01-13 15:16:26 +01:00
Bassoonian
37211c611b
Deleted unnecessary files ( #8899 )
2026-01-12 22:01:22 +01:00
amiosi
0870fe24c7
Miscellaneous species_info Changes ( #8462 )
2026-01-11 18:54:43 +01:00
RoamerX
06bf56b008
fix: 解决合并冲突
2026-01-09 21:01:43 +08:00
amiosi
dc128c608b
add the type boost value for gen 3 sea incense ( #8826 )
2026-01-08 11:35:21 +01:00
Eduardo Quezada
45295d9544
B_ABILITY_TRIGGER_CHANCE config tests (#8594 )
2026-01-06 15:53:29 +01:00
amiosi
126100c027
fix crash damage implementation and incorrect memento generation ( #8804 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2026-01-06 00:18:46 +01:00
amiosi
c506d52d32
Miscellaneous fixes to configs and other values ( #8662 )
2026-01-03 17:34:30 +01:00
Alex
900abdb5a6
Add enum for battle script commands ( #8778 )
2026-01-03 13:52:21 +00:00
moostoet
0e33bf916e
Fix berry activation timing for Yawn sleep and Leech Seed damage ( #8776 )
2026-01-03 08:50:17 +01:00
Bassoonian
a5ee0f2727
ItemTMHMOrEvolutionStone enum ( #2192 )
2026-01-02 20:59:12 +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
FosterProgramming
d214d178f3
Add check to warn of a non-working config setup ( #8686 )
2026-01-02 15:57:09 +01:00
Hedara
c09339cc46
Start of 1.14.3 cycle
2026-01-02 10:45:08 +01:00
Hedara
64d40d3c14
Expansion 1.14.2 release
2026-01-02 10:41:18 +01:00
Bassoonian
c3d1487838
Pret merge (1st of January, 2026) ( #8737 )
2026-01-02 10:18:02 +01:00
FosterProgramming
9e1a593d35
Refactor dexnav to not use overworld task ( #8602 )
2026-01-02 09:38:55 +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
RoamerX
dc41d1cab9
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master
2025-12-29 23:03:47 +08:00
Josh
349da0484b
Document m4a xcmd_0C
2025-12-27 01:11:40 +00:00
Alex
ac221a3aa8
Fix incorrectly applied change in atkcanceler ( #8641 )
2025-12-24 01:16:26 +01:00
grintoul
d55d2b6dfc
Corrects test system Forced Ability handing for multi battles ( #8611 )
2025-12-22 10:11:21 +01:00
RoamerX
32a49667b3
Merge pull request #81 from rh-hideout/master
...
sync update
2025-12-22 16:23:01 +08:00
Eduardo Quezada
828e12bee6
B_SPORT_DMG_REDUCTION config tests (#8593 )
2025-12-20 15:47:46 +01:00
