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 |
|
psf
|
b60c897b4a
|
Add P_ASK_MOVE_CONFIRMATION (#7132)
|
2025-06-27 10:11:41 +02:00 |
|
Eduardo Quezada
|
57da4617da
|
Ability status immunity
|
2025-06-26 17:44:29 -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 |
|
Bivurnum
|
c6221fa50e
|
Add debug options for follower NPCs (#7215)
|
2025-06-25 21:13:43 +02:00 |
|
Alex
|
773ecd4c24
|
Fixes OOB for Teatime and Flower Shield (#7214)
|
2025-06-25 21:00:49 +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
|
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 |
|
Alex
|
f8551830c9
|
Adds Gen5+ Encore config (#7051)
|
2025-06-25 15:58:30 +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 |
|
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 |
|
Alex
|
66e8200d95
|
Use battler arguments for SetMoveEffect (#7156)
|
2025-06-23 15:26:31 +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 |
|
AlexOn1ine
|
aabb632894
|
Master to upcoming merge, 20/06/25
|
2025-06-20 17:09:58 +02:00 |
|
Alex
|
57feee3743
|
Add missing flag for Berserk Gene (#7151)
|
2025-06-19 14:26:28 +02:00 |
|
Daniel Walls
|
cc33d6171b
|
Add config options for removing bard phoneme audio to save ROM space (#7155)
|
2025-06-18 20:16:25 -07:00 |
|
PhallenTree
|
340d815c6d
|
Stat Change (Animation) Refactor (#7144)
|
2025-06-18 14:24:35 +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 |
|
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 |
|
RoamerX
|
8c0bfceb99
|
Update scripts.inc
|
2025-06-12 22:39:59 +08:00 |
|
Hedara
|
bdd7c5bfa8
|
Merge branch 'master' into master-merge
Conflicts:
src/contest_painting.c
|
2025-06-09 23:27:18 +02:00 |
|
kittenchilly
|
872bb8785b
|
Simplify white out messages (#6961)
|
2025-06-08 08:52:37 -07: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 |
|
Alex
|
020be9d5b0
|
Deprecate sStatusFlagsForMoveEffects (#7063)
|
2025-06-05 14:32:28 +02:00 |
|
ExMingYan
|
e0e08da7a8
|
删除文件中存在的U+200C零宽字符
|
2025-06-05 12:43:27 +08:00 |
|
RoamerX
|
85af9cdb32
|
测试发现的文本问题修复
姓名鉴定师、秘密基地教学文本重新翻译
debug部分遗漏文本补充汉化
其他几处零散汉化修正
|
2025-06-04 23:17:06 +08:00 |
|
Eduardo Quezada
|
3decd3da0a
|
Animation documentation (#7052)
|
2025-06-04 11:19:57 +02:00 |
|
Alex
|
177fa2f096
|
Combines Super Fang and Guardian of Alola effects (#7048)
|
2025-06-03 10:26:25 +02:00 |
|
RoamerX
|
f83e94af5e
|
merge1.12.0
|
2025-06-02 14:17:22 +08:00 |
|
Eduardo Quezada
|
3565c7a8a6
|
Documented usage of delay X (#6951)
|
2025-06-01 17:11:42 +02:00 |
|
Alex
|
ede15918cf
|
Refactors Final Gambit + Tests (#7005)
|
2025-05-31 15:52:53 +02:00 |
|
ShinyVolcarona
|
7f4f391e9b
|
New Attack Animations: 25w20a (#6886)
|
2025-05-31 11:34:24 +02:00 |
|