RoamerX
|
53c0f8061d
|
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master
|
2025-08-25 16:21:16 +08: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 |
|
hedara90
|
95eb3ba1a7
|
Fix B_ANIMATE_MON_AFTER_KO with a new counter (#7531)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
|
2025-08-21 14:43:41 +02:00 |
|
Alex
|
208f97e1e3
|
Rename passive damage hitmarker (#2174)
|
2025-08-21 13:43:19 +01:00 |
|
RavePossum
|
2d9dc28b7a
|
Fix in-game partner battles always causing a whiteout (#7587)
|
2025-08-21 12:44:15 +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 |
|
RoamerX
|
cc5b36846a
|
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master
|
2025-08-04 20:19:39 +08:00 |
|
AlexOn1ine
|
54ffc6bf08
|
Fixes Leech Seed recovery not applying behind Sub
|
2025-08-03 21:59:48 +02:00 |
|
PhallenTree
|
01105171a3
|
Fixes Magnet Rise when user is Rooted/Smacked Down (#7449)
|
2025-07-31 19:30:50 +02:00 |
|
Alex
|
038bd2717d
|
Pret merge (27th of July, 2025) (#7422)
|
2025-07-28 15:13:23 +02:00 |
|
PhallenTree
|
8bfc5b3093
|
Fixes Razor Wind not activating after hit effects after the first target (#7413)
|
2025-07-28 14:21:12 +02:00 |
|
Eduardo Quezada
|
d801556a97
|
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727
|
2025-07-27 11:59:07 -04:00 |
|
Alex
|
38964e4f0a
|
Fixes Wandering Spirit overwriting battlers (#7407)
|
2025-07-25 13:26:12 -04:00 |
|
RoamerX
|
f7e45ca2b3
|
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master
|
2025-07-24 17:15:11 +08:00 |
|
Alex
|
705f194d98
|
Fixes various battler corruption during switch in ability activation (#7352)
|
2025-07-18 12:28:00 +02:00 |
|
AERDU
|
da3d223c45
|
fallback bugfix for B_DARK_VOID_FAIL < GEN_7 (#7351)
|
2025-07-16 12:41:32 +02:00 |
|
ghoulslash
|
c7b2c771e1
|
Cotton down use jumpifabsent (#7318)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-07-11 09:43:14 +02:00 |
|
RoamerX
|
c58b0a0921
|
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master
|
2025-07-10 22:39:44 +08:00 |
|
Alex
|
f808201945
|
Fixes Natural Gift moveend execution (#7274)
|
2025-07-05 15:05:35 -04:00 |
|
RoamerX
|
6d5abfcc06
|
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master
|
2025-07-05 15:47:12 +08:00 |
|
hedara90
|
56907bc26e
|
Merrp merge, 2025-06-25 (#7217)
|
2025-07-04 13:03:09 +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 |
|
ghoulslash
|
21ac62f781
|
Flush textbox for Truant Popup (#7252)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-06-29 21:38:52 +02:00 |
|
PhallenTree
|
6ed4f73f6a
|
Fixes Emergency Exit sometimes causing an unrelated battler to become invisible (#7241)
|
2025-06-28 23:20:40 +02:00 |
|
Alex
|
773ecd4c24
|
Fixes OOB for Teatime and Flower Shield (#7214)
|
2025-06-25 21:00:49 +02:00 |
|
Hedara
|
c0a50096f3
|
Merge commit '75642625439306f0cc5aed81177dc191f0d5950e' into merrp-merge
Conflicts:
include/constants/event_objects.h
src/event_object_movement.c
src/follower_helper.c
|
2025-06-25 17:54:59 +02:00 |
|
Hedara
|
1916703e5a
|
Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge
Conflicts:
include/battle_script_commands.h
include/constants/event_objects.h
include/event_object_movement.h
include/field_effect.h
include/field_effect_helpers.h
include/sprite.h
src/battle_controller_player.c
src/event_object_movement.c
src/pokeball.c
|
2025-06-25 17:49:19 +02:00 |
|
Hedara
|
150091990d
|
Merge commit '07fd8a28fbd5b23a6828846e4606fc3ecd54c3d9' into merrp-merge
|
2025-06-25 17:14:52 +02:00 |
|
Ariel A
|
7564262543
|
Merge branch 'followers' into lighting
|
2025-06-24 20:44:44 -04:00 |
|
Ariel A
|
685a8a9118
|
Merge remote-tracking branch 'upstream/master' into followers
|
2025-06-24 20:39:12 -04:00 |
|
Ariel A
|
07fd8a28fb
|
fix: hide followers when player enters Battle Pike curtains
|
2025-06-24 20:16:04 -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 |
|
RoamerX
|
c20c5d851b
|
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master
|
2025-06-23 20:29:34 +08: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
|
57feee3743
|
Add missing flag for Berserk Gene (#7151)
|
2025-06-19 14:26:28 +02:00 |
|
ghoulslash
|
a154d7a7a4
|
Fix savage spin out spider web template (#7137)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-06-18 11:04:24 +02: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 |
|
RoamerX
|
8c0bfceb99
|
Update scripts.inc
|
2025-06-12 22:39:59 +08:00 |
|
RoamerX
|
773957bd73
|
联机相关文本参照正作进行调整
主要包括联机俱乐部以及联盟交谊厅
统一了“群组”与“组长”的翻译
|
2025-06-08 23:35:17 +08:00 |
|
RoamerX
|
7228b9e0a1
|
一些文本修正
乔伊小姐对话、蛋孵化的文本及训练家卡的颜色替换为正作翻译
将树果粉碎的错误翻译修正、并将对应翻译参照神百调整
将树果混合器的翻译统一
|
2025-06-06 21:04:14 +08:00 |
|
RoamerX
|
714cec1f69
|
反派组织成员剩余台词润色/重新翻译
|
2025-06-06 17:04:44 +08:00 |
|
Alex
|
f374291f69
|
Fixes Wandering Spirit copied ability activation on fainted mon (#7066)
|
2025-06-05 22:47:32 +02:00 |
|
RoamerX
|
11603d8c2d
|
测试发现的文本问题修复
反派组织手下部分台词重新翻译
招式学习器道具说明换行调整
其他零散台词修正调整
|
2025-06-05 23:54:19 +08:00 |
|
ExMingYan
|
e0e08da7a8
|
删除文件中存在的U+200C零宽字符
|
2025-06-05 12:43:27 +08:00 |
|
RoamerX
|
85af9cdb32
|
测试发现的文本问题修复
姓名鉴定师、秘密基地教学文本重新翻译
debug部分遗漏文本补充汉化
其他几处零散汉化修正
|
2025-06-04 23:17:06 +08:00 |
|
RoamerX
|
f83e94af5e
|
merge1.12.0
|
2025-06-02 14:17:22 +08:00 |
|