13139 Commits

Author SHA1 Message Date
RoamerX
2cb08cdf3e Update contest.c 2025-05-23 21:58:02 +08:00
RoamerX
f9b101fdb8 批量文本润色修正及重新汉化
string.c中的大量专有名词及语句的文本参照正作官译进行调整
华丽大赛柜台的所有文本重新汉化
华丽大赛招式参照神百再次进行了调整
华丽大赛场内文本在SKT大佬的基础上进行了微调
汉化了宝可方块盒中遗漏的文本及图片,调整了相关文本的代码以优化语序
修正部分换行问题
2025-05-23 21:55:52 +08:00
Pawkkie
71f1c97d3e
Fix switch AI considering non-choiced SE moves when choiced (#6892) 2025-05-23 14:20:36 +02:00
Pawkkie
d3cadf093e
Fix HasBattlerSideMoveWithEffect comment (#6965) 2025-05-23 14:18:59 +02:00
Alex
6e63827bd7
Master to upcoming, 2025-05-22 (#6959) 2025-05-23 14:18:16 +02:00
Alex
87cbb457f1
Fixes AI not seeing primal weather and partner absorbing abilities (#6936) 2025-05-22 17:25:29 -04:00
Alex
f9400332fc
Fixes AI repeated use of weather set up moves (#6963) 2025-05-22 16:50:13 -04:00
Hedara
b6aa0618b5 Fix unused variable 2025-05-22 21:49:45 +02:00
Pawkkie
0530f49fd4
Fix AI boosting stats into mon with Haze (#6894) 2025-05-22 21:05:02 +02:00
GriffinR
fba096a500 Remove map_group_count.h 2025-05-22 13:59:23 -04:00
Alex
48100e9593
Fixes Unnerve activation not limited to 1 per switch-in (#6960) 2025-05-22 19:15:01 +02:00
Hedara
90aed43c27 Merge branch 'master' into master-upcoming
Conflicts:
	.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
	.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
	.github/ISSUE_TEMPLATE/03_feature_requests.yaml
	.github/ISSUE_TEMPLATE/04_other_errors.yaml
	.github/pull_request_template.md
	src/battle_controller_player.c
	src/battle_main.c
	src/battle_script_commands.c
	src/battle_util.c
	src/data/graphics/pokemon.h
	src/data/pokemon/species_info/gen_9_families.h
	test/battle/ability/flower_veil.c
	test/battle/ability/sweet_veil.c
	test/battle/ability/synchronize.c
	test/battle/ability/water_bubble.c
	test/battle/move_effect/fell_stinger.c
	test/battle/move_effect/level_damage.c
	test/battle/move_effect/magic_room.c
	test/battle/move_effect/me_first.c
	test/battle/move_effect/sky_drop.c
	test/battle/move_effect/smack_down.c
	test/battle/move_effect/wish.c
	test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c
2025-05-22 15:41:08 +02:00
RoamerX
c0b954333e 对战开拓区接待处文本修正
一些其他换行问题的修正
2025-05-22 21:11:41 +08:00
Alex
b31a73f990
Rename ItemId_GetX to GetItemX (#2116) 2025-05-22 13:27:52 +01:00
Eduardo Quezada
9554146738
Fixed forfeit money for B_WHITEOUT_MONEY <= GEN_3 (#6942) 2025-05-22 14:27:28 +02:00
Alex
8ec998abff
Fixes ate type being ignored after checking summary screen (#6888) 2025-05-22 14:07:36 +02:00
PhallenTree
eb2121924d
Fixes Knock Off/Smack Down effect on immune target/protect (#6958) 2025-05-22 11:26:54 +02:00
Alex
8ad1f329c9
Fixes Dazzling abilities activating on all multi hit move hits (#6943) 2025-05-22 10:37:00 +02:00
Eduardo Quezada
be4b8ca3d0
Fix KNOWN_FAILING Bestow tests (#6947) 2025-05-22 10:23:15 +02:00
Eduardo Quezada
d42d9012e4
Documented usage of createsprite gDirtPlumeSpriteTemplate (#6954) 2025-05-22 09:27:30 +02:00
Abaresk
bef343cefa Remove berry yield bug fix 2025-05-21 16:11:18 -04:00
Alex
95036e3b9f
Fixes global usage in super fang effect. (#6941) 2025-05-21 20:33:52 +02:00
RoamerX
5546037e80 调整优化对战开拓区对话文本
重新翻译了对战开拓区所有设施以及接待处的所有文本
进一步调整了暂停挑战以及结束挑战的相关文本以避免混淆
更新了对战设施门口牌子的介绍文本,部分参照神百
参照正作更新了选择宝可梦参加挑战时的相关文本
其他:
将联机中心的译名修改为联机俱乐部
将文本英文的!?:,.替换成对应的汉字符号
2025-05-21 23:47:05 +08:00
Alex
ce079cfcc8
Fixes Life Orb damage still happening after attacker was unable to attack (#6940) 2025-05-21 16:16:33 +02:00
PhallenTree
a639460c27
Fixes Ice Body healing HP regardless of weather (#6939) 2025-05-21 14:25:12 +02:00
Eduardo Quezada
87fbf22476
Fix Rage Fist evolution method (#6937) 2025-05-21 10:41:51 +02:00
ghoulslash
c485ae4e90
add fail ptr arg to JumpIfMoveFailed, fix tryworryseed (#6925)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-05-20 17:07:29 +02:00
Kurausukun
bd0a02c456
Correct C23 Checks (#2144) 2025-05-19 15:43:06 +01:00
Bassoonian
59d315734d
Update header files to match source files (#2143) 2025-05-19 09:18:04 +01:00
Kurausukun
e1e7d1cf35
Fixes for C23 Support (#2138)
* fixes for c23 support
* include global.h in m4a.c & remove <string.h> include
2025-05-19 09:11:59 +01:00
grintoul1
0d8d36499b
Mugshot Transitions 2v1 fix (#6911) 2025-05-19 07:44:05 +02:00
kittenchilly
75f6d85582
Improve a few Gen 9 Pokemon sprites (#6885) 2025-05-17 19:48:44 +02:00
RoamerX
6f69e7f5eb 对于对战开拓区&对战帐篷的文本进行了重新翻译
虽然原本进行了一些修正和润色,但是整体质量偏低,于是重新进行了汉化
调整了开拓区对战设施的成绩页面文字展示位置
对培育屋的文本进行了重新翻译
参照官方正作的使用逻辑统一调整了数字使用阿拉伯数字和汉字的情况
参照官方正作的使用逻辑统一调整了使用“战斗”和“对战”的情况
修正了部分连接相关文本的译名
主要参考deepseek英文翻译及原版英文
2025-05-18 00:10:23 +08:00
Eduardo Quezada
29a6113318
Debug menu cleanup (#6881) 2025-05-17 16:55:05 +02:00
Alex
f1c1906324
Fix misleading name (#6865) 2025-05-17 16:23:30 +02:00
Eduardo Quezada
406fd7ce81
Expand trainerproc to support additional battle types (#6770)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-05-17 15:08:44 +02:00
Eduardo Quezada
4145404d22
Optimized PokemonUseItemEffects function (#6878) 2025-05-17 15:08:28 +02:00
Bassoonian
54806c8838
Add no-whiteout feature (#6795) 2025-05-17 11:20:35 +02:00
Eduardo Quezada
edf7c67775
Remove non-volatile status EFFECTs (#6772) 2025-05-16 22:52:51 +02:00
Alex
73e65b76c4
Consolidated HasMoveFlagX functions (#6874) 2025-05-16 20:50:45 +02:00
surskitty
e44d0326be
AI double battle friendly fire logic improvements (#6766) 2025-05-16 11:41:03 -04:00
Bassoonian
d1307371db
Master to upcoming merge (#6879) 2025-05-16 17:25:15 +02:00
jfb1337
d57dcd2e35
Reword move and ability descriptions to improve clarity (#6861)
Co-authored-by: jfb1337 <>
2025-05-16 17:23:56 +02:00
PhallenTree
1a707e8735
Fixes Magic Guard causing Wrap to end immediately (#6876) 2025-05-16 15:29:48 +02:00
Bassoonian
16357c7e29
Streamline pointer notation (#2139) 2025-05-16 12:04:44 +01:00
AlexOn1ine
33607529cd conflicts 2025-05-16 10:46:32 +02:00
innocenthedgehog
49584e134b
Switch AI considers Bulletproof ability (#6872) 2025-05-16 10:35:34 +02:00
Bivurnum
ddff74e8f9
Bug fix: add proper elevation handling for npc followers (#6871) 2025-05-16 09:54:22 +02:00
hedara90
4d4dea1b38
Master to upcoming merge (#6868) 2025-05-16 09:37:39 +02:00
kittenchilly
7359d234c8
PokeCommunity sprites batch (April 2025) (#6840) 2025-05-16 09:35:30 +02:00