Alex
9259b7ee69
Bugfixes batch ( #6750 )
2025-05-02 20:14:27 +02:00
hedara90
ccda2308a3
Add AI_FLAG_PP_STALL_PREVENTION ( #6743 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-02 11:30:09 -04:00
DavidJCobb
0f17e70371
Shorter names for engine/controller communication enum members
2025-05-02 00:01:15 -04:00
DavidJCobb
d83b0671f7
Battle anims, ice: ARRAY_COUNT works if used with a cast
2025-05-01 23:49:05 -04:00
摆烂
fc76d93d26
Merge branch 'rh-hideout:master' into master
2025-05-02 09:34:31 +08:00
AlexOn1ine
9a14bb2dd3
removed aiFlags prefix
2025-05-01 20:22:11 +02:00
AlexOn1ine
182d42642d
Move out ai struct out of BattleResources
2025-05-01 11:27:48 +02:00
PhallenTree
fadf472157
Adds RNG tags and tests for Moody and Starf Berry ( #6718 )
2025-05-01 10:16:15 +02:00
Pawkkie
1a2cd5645a
Fix roll handling in AI party damage calcs ( #6733 )
2025-05-01 10:15:19 +02:00
Pawkkie
4b1789ab1e
Fix Wonder Guard potential double switching ( #6737 )
2025-04-30 18:16:48 -04:00
Alex
55f9f6adea
Refactor battler flee and watch options + clean up ( #6724 )
2025-04-30 11:54:42 -04: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
Cafe
b451bc3606
New Lurantis animation ( #6725 )
2025-04-30 12:45:29 +02:00
RoamerX
091c17b5bf
EASYCHAT图片汉化
2025-04-30 18:41:15 +08:00
Alex
afcba8d9cd
Fixes Stomping Tantrum not doubling power if asleep or frozen ( #6719 )
2025-04-29 23:25:56 +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
RoamerX
acbbb4f865
修复所有句尾结束没有标点符号的对话
2025-04-29 14:54:12 +08:00
RoamerX
a7211fe61d
Update strings.c
2025-04-29 14:10:23 +08:00
RoamerX
a812c96187
主要是开拓区的文本重译+润色
...
物品统一译为道具（重要物品、装饰物品等名称不变）
2025-04-29 14:04:21 +08:00
Pawkkie
ab6a97d20d
remove predictedScore
2025-04-28 21:47:17 -04:00
Pawkkie
787a8a0d9d
Merge remote-tracking branch 'upstream/upcoming' into move-prediction
2025-04-28 13:23:33 -04:00
Bivurnum
49ae82c679
changed remove check from objId to localId for npc followers
2025-04-28 10:58:35 -05:00
RoamerX
c1b992791c
文本重译+润色
...
缎带统一为奖章
2025-04-28 23:02:48 +08:00
DavidJCobb
35b33a46e9
Identified task and sprite fields related to battle weather animations
...
Named task and sprite fields related to the animations for Hail, Rain Dance, and Sandstorm.
2025-04-28 05:39:52 -04:00
Pawkkie
96a8035dec
Fix party data assignment ( #6712 )
2025-04-28 08:48:21 +02:00
Pawkkie
7a3cf5d3a3
Improve AI's defense against Focus Punch ( #6713 )
2025-04-28 08:34:09 +02:00
Pawkkie
38c90909eb
WORKS, still needs work :D
2025-04-28 00:56:03 -04:00
Pawkkie
4970b3bd95
Merge remote-tracking branch 'upstream/upcoming' into move-prediction
2025-04-28 00:33:42 -04:00
Eduardo Quezada
c1b9ed5dcf
Fixed upcoming not compiling in gcc 11.4.0 ( #6710 )
2025-04-27 23:11:03 -04:00
hedara90
67f3405864
Fix pc mon pic ( #6709 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-27 15:19:46 -04:00
hedara90
5dfbdf56da
27/04/25 Master to upcoming merge ( #6701 )
2025-04-27 18:01:50 +02:00
RoamerX
99dce883e4
文本批量修正、微调及润色
2025-04-27 21:37:42 +08:00
Eduardo Quezada
fc872b481e
Fix FORM_CHANGE_ITEM_HOLD bug manifested during givemon ( #6702 )
2025-04-27 15:27:21 +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
19fb962173
remove more unused
2025-04-27 14:56:03 +02:00
AlexOn1ine
1c5d9b4708
unused var
2025-04-27 10:03:31 +02:00
AlexOn1ine
e246b20e72
27/04/25 Master to upcoming merge
2025-04-27 09:50:25 +02:00
RoamerX
bbd7853a95
批量修正、微调及润色
2025-04-27 15:01:24 +08:00
RoamerX
951296a9d3
修复釜炎镇地名错误
2025-04-27 10:51:38 +08:00
Alex
87bd59b6f4
Fixes Z and Max moves dmg reduction against side protection - upcoming ( #6698 )
2025-04-26 23:37:15 +02:00
hedara90
d1aa49cca3
Remove compressed palettes ( #6455 )
2025-04-26 22:58:40 +02:00
Alex
1cd4d23969
Fixes Z and Max moves dmg reduction against side protection ( #6697 )
2025-04-26 21:46:41 +02:00
DavidJCobb
2864408060
Tweaks to documentation comments
2025-04-26 11:40:14 -04:00
DavidJCobb
b4ee45f3e8
Renamed BATTLELINKMSGTYPE_ to BATTLELINKCOMMTYPE_
...
I want to avoid the word "message" since PRET has already chosen "battle message" as the term for predefined strings usable in the battle scripts and UI.
I was considering the term "battle link packet" instead, but the library for wireless communications already uses the word "packet" even though GBATEK does not. I'm going with "battle link communication type" instead. For this particular context, I don't think we need a compound noun ("X type"); the singular noun "type" is fine enough.
2025-04-26 11:37:20 -04:00
RoamerX
75d2beddbb
宝可导航信息调整
...
对战寻呼训练家信息暂时改用小号字体以显示完整
菜单选项由“导航器”改成“导航”
2025-04-26 22:54:47 +08:00
DavidJCobb
d8721b668e
Fixed find-and-replace mistake
...
Functions were using the wrong constant.
2025-04-26 10:54:22 -04:00
RoamerX
257c6e1f41
Merge branch 'master' of https://github.com/rh-hideout-chinese/pokeemerald-expansion
2025-04-26 21:54:05 +08:00
RoamerX
ce12aa0adf
文本修正、微调及润色2
2025-04-26 21:54:01 +08:00
RoamerX
df515d0057
Merge branch 'rh-hideout:master' into master
2025-04-26 21:52:42 +08:00
