4321 Commits

Author SHA1 Message Date
摆烂
fc76d93d26
Merge branch 'rh-hideout:master' into master 2025-05-02 09:34:31 +08: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
a812c96187 主要是开拓区的文本重译+润色
物品统一译为道具(重要物品、装饰物品等名称不变)
2025-04-29 14:04:21 +08:00
RoamerX
c1b992791c 文本重译+润色
缎带统一为奖章
2025-04-28 23:02:48 +08:00
RoamerX
b70b8224dd 对战开拓区文本大批量重译+润色 2025-04-28 21:37:36 +08:00
RoamerX
99dce883e4 文本批量修正、微调及润色 2025-04-27 21:37:42 +08:00
RoamerX
bbd7853a95 批量修正、微调及润色 2025-04-27 15:01:24 +08:00
RoamerX
ce12aa0adf 文本修正、微调及润色2 2025-04-26 21:54:01 +08:00
RoamerX
3d45119bbe 大批量文本修正、微调及润色 2025-04-26 21:51:46 +08:00
RoamerX
5fc2213e1c 遗漏的换行文本溢出情况修复
Pokenav统一为宝可导航,全流程中仅兹伏奇初次介绍时使用
送神山码头文本错误翻译修复
城市名称统一补全为XX市/镇
哈奇老人相关的文本调整
海员统一修正为水手
标点符号重复使用修复
小遥错字修复
汉化优化
2025-04-24 18:14:06 +08:00
RoamerX
a1a09123b2 破折号统一补充 2025-04-24 16:23:35 +08:00
RoamerX
64c17a76f2 包括全部NPC训练家对战文本在内的大量文本修正及润色
润色了全部NPC训练家对战前后的文本
统一了破折号的使用
将“培养”“饲育”等词统一规范为“培育”
其他个别错误修正
2025-04-24 16:19:31 +08:00
RoamerX
f3917e42d4 Update questionnaire.inc 2025-04-23 20:13:17 +08:00
RoamerX
8175f377ee Update scripts.inc
之前遗漏的一处汉化译名修正
2025-04-23 20:04:34 +08:00
RoamerX
2b265bd01a
Merge branch 'rh-hideout:master' into master 2025-04-23 15:42:35 +08:00
PhallenTree
91fc406b0a
Fixes Mirror Armor stat drops not being stopped by Substitute (#6675) 2025-04-22 19:54:04 +02:00
RoamerX
b556c1fbeb 把所有的省略号从“…”统一成“……” 补充 2025-04-22 17:05:00 +08:00
RoamerX
7036cbe69b Update scripts.inc 2025-04-22 16:57:00 +08:00
RoamerX
97501e8843 【危险举动,需要测试】把所有的省略号从“…”统一成“……”
涉及上千处改动,出现问题则回退
2025-04-22 16:50:58 +08:00
RoamerX
ee980e6505 继续检查每行字数超标,检查换行次数超标,汉化遗漏的英文文本 2025-04-22 16:21:52 +08:00
RoamerX
12714a337a 检查每行字数超标,检查换行次数超标,汉化遗漏的英文文本 2025-04-22 15:32:17 +08:00
RoamerX
03d4b3db51
Merge pull request #35 from rh-hideout/master
update master
2025-04-22 12:36:11 +08:00
Alex
d220459a01
Fixes Intimidate / Eject Pack interaction (#6645)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-21 17:33:29 +02:00
RoamerX
1709580269 修复几个手残小错误 2025-04-21 21:44:19 +08:00
RoamerX
2e00ddb067 汉化补充修正
汉化了树果混合器相关文本(src\berry_blender.c)
汉化了宝可方块相关文本(src\pokeblock.c)
汉化了所有奖章的说明文本(src\data\text\gift_ribbon_descriptions.h)
汉化了宝可梦导航器的相关文本(src\pokenav_main_menu.c,src\pokenav_list.c,src\pokenav_match_call_gfx.c,src\pokenav_menu_handler_gfx.c)
汉化了导航仪地图界面的地标名称(src\landmark.c),并统一了脚本中它们的叫法
汉化了零散遗漏的英文文本
宝可梦的量词按照朱紫统一成“只”而不是“个”
2025-04-21 21:36:17 +08:00
Alex
c4edfd2988
Fix gBattlerTarget OOB for Gravity and Perish Song (#6662) 2025-04-21 13:53:04 +02:00
cawtds
0069ec1f0c
Fix captivate-oblivious interaction and related test (#6653) 2025-04-21 11:01:01 +02:00
Alex
86969f9919
Remove HitmarkerSwapAttackerTarget (#6627)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-20 22:49:52 +02:00
RoamerX
1f32b0796e Update braille.inc 2025-04-20 22:18:18 +08:00
RoamerX
1e83c50595 盲文翻译
但是文言文(
一部分是因为字数限制
之后可能会再更改
2025-04-20 21:52:50 +08:00
RoamerX
fa33ee6283 多选框文本、对战开拓区头目对战后文本、存档错误界面汉化 2025-04-19 23:53:54 +08:00
RoamerX
dce4c9e6a6 秘密基地装饰物品名称及说明
出奇一击技能说明跟随更新修正
一些零散的汉化遗漏补全
2025-04-19 23:14:30 +08:00
RoamerX
0cf7325d5e 汉化之前漏过的问卷(神秘礼物相关)、秘密基地训练家文本
上一个commit里提交了边境的小岛(梦幻)相关的脚本文本
修正了双人训练师后续电话文本的人名颠倒错误
2025-04-19 16:16:08 +08:00
RoamerX
7d93ac7d20 Merge branch 'master' of https://github.com/rh-hideout-chinese/pokeemerald-expansion 2025-04-19 15:49:04 +08:00
RoamerX
407cb8294c battle_message.c对战文本替换程序及结果修正 2025-04-19 15:48:50 +08:00
RoamerX
4fe9e8a5f4
Merge pull request #32 from rh-hideout/master
update master
2025-04-19 12:35:38 +08:00
hedara90
17b992bec5
Fixes some moves trying to load too much VRAM (#6633)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-18 17:16:46 -04:00
Alex
6b09480912
Fixes some restore issues (#6629) 2025-04-18 16:57:04 -04:00
hedara90
4528bbe01d
Fix VRAM load for Black Hole Eclipse (#6635)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-17 15:42:25 +02:00
12014
9910770613 Redo Translations for the text and picture of Contests 2025-04-17 02:51:06 +09:00
RoamerX
184ec657ac Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-04-15 22:17:30 +08:00
12014
1e70488649 Translation of the texts of Player PC, the Pokemon storage System and some Graphics. 2025-04-15 22:07:47 +09:00
RoamerX
6f814f491d 修正event_scripts,PC寄存系统盒子文本汉化
选择PM时多选框宽度较长,待查看优化
2025-04-15 02:31:51 +08:00
RoamerX
179fd39cc0 Update event_scripts.s
按照官译修正
2025-04-15 01:51:58 +08:00
RoamerX
3139be8065
Merge pull request #27 from sayseong/master
Update event_scripts.s
2025-04-15 01:23:37 +08:00
RoamerX
f760cfe534 Merge branch 'master' of https://github.com/rh-hideout-chinese/pokeemerald-expansion 2025-04-15 01:18:51 +08:00
RoamerX
011a62a38c 根据2011版汉化文本修正所有脚本中的文本错误及译名 2025-04-15 01:18:41 +08:00
PhallenTree
3b05d7934f
Fixes wrong battler's Illusion wearing off when the Attacker faints and fixes Illusion tests (#6596) 2025-04-14 18:17:24 +02:00
hedara90
40c5ad5043
Fix Magma Storm getting stuck (#6605)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-14 17:07:59 +02:00