3110 Commits

Author SHA1 Message Date
Eduardo Quezada
96650ffd27
Add "Move Item" option in party menu (#6758) 2025-05-04 11:40:31 +02:00
摆烂
fc76d93d26
Merge branch 'rh-hideout:master' into master 2025-05-02 09:34:31 +08: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
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
a812c96187 主要是开拓区的文本重译+润色
物品统一译为道具(重要物品、装饰物品等名称不变)
2025-04-29 14:04:21 +08:00
RoamerX
c1b992791c 文本重译+润色
缎带统一为奖章
2025-04-28 23:02:48 +08: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
RoamerX
951296a9d3 修复釜炎镇地名错误 2025-04-27 10:51:38 +08:00
hedara90
d1aa49cca3
Remove compressed palettes (#6455) 2025-04-26 22:58:40 +02:00
RoamerX
ce12aa0adf 文本修正、微调及润色2 2025-04-26 21:54:01 +08:00
RoamerX
3d45119bbe 大批量文本修正、微调及润色 2025-04-26 21:51:46 +08:00
RoamerX
454343f53d 装饰物品说明换行修正 2025-04-26 19:16:14 +08:00
RoamerX
dcfeec35d6 更正与熏香效果相同的属性强化道具的说明
变成独立的文本了,顺便把中文用不到的pluralName复数名称项全部删除了
2025-04-26 18:47:30 +08:00
PCG
f661f3b3ac
Pokedex Plus HGSS move configs (#6687) 2025-04-24 19:34:37 +02:00
RoamerX
64c17a76f2 包括全部NPC训练家对战文本在内的大量文本修正及润色
润色了全部NPC训练家对战前后的文本
统一了破折号的使用
将“培养”“饲育”等词统一规范为“培育”
其他个别错误修正
2025-04-24 16:19:31 +08:00
khbsd
971a595e4a
Evolution Refactor (#6556)
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2025-04-23 16:01:33 +02:00
RoamerX
5ba6e60b56 Update apprentice.h
徒弟名字汉化,感谢SKT大佬
2025-04-22 23:16:44 +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
Alex
dfb1cd2ec0
Refactor hit escape moves to use moveend (#6671) 2025-04-21 22:52:55 +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
RoamerX
bab84747e3 对战帐篷NPC训练家名字
感谢SKT大佬的日文汉化
对战开拓区名字有字符限制,个人调整了几个四字名称为三字
2025-04-21 16:24:25 +08:00
RoamerX
d2eace35d0 对战开拓区训练家名字汉化 2025-04-20 20:47:26 +08:00
RoamerX
bf30806c70 训练家之丘人名&PM昵称汉化+修复src\frontier_util.c中文本外叹号全角的错误 2025-04-20 11:30:07 +08:00
RoamerX
dce4c9e6a6 秘密基地装饰物品名称及说明
出奇一击技能说明跟随更新修正
一些零散的汉化遗漏补全
2025-04-19 23:14:30 +08:00
RoamerX
5ebc7afd4a Update shared_dex_text.h
多形态图鉴文本补全汉化
2025-04-19 16:37:26 +08:00
摆烂
f085b950a8
补充精灵名称漏译(谜拟丘) 2025-04-19 15:35:05 +08:00
摆烂
ba6d14391a
补充精灵名称漏译(未知图腾) 2025-04-19 15:25:28 +08:00
摆烂
e56fbb407f
补充精灵名称漏译(盖诺赛克特) 2025-04-19 15:24:01 +08:00
摆烂
ea79666873
补充精灵名称漏译(彩粉蝶,花蓓蓓,花叶蒂,花洁夫人,多丽米亚) 2025-04-19 15:20:26 +08:00
摆烂
5132c8af23
补充精灵名称漏译(霜奶仙) 2025-04-19 15:15:04 +08:00
摆烂
6fba6bd42e
补充精灵名称漏译(绅士蛾) 2025-04-19 15:12:36 +08:00
摆烂
b7df2521cd
补充精灵名称漏译(粉蝶虫和粉蝶蛹) 2025-04-19 15:10:45 +08:00
摆烂
31b94ee3ba
补充精灵名称漏译(厄诡椪) 2025-04-19 15:01:33 +08:00
摆烂
13badbf91f
补充精灵名称漏译(银伴战兽和小陨星) 2025-04-19 15:00:00 +08:00
摆烂
e0ac33f123
补充精灵名称漏译(阿尔宙斯) 2025-04-19 14:56:57 +08:00
grintoul1
ec2aef2eff
Battle Transition: mugshots for multibattles (#6567)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-17 16:18:20 +02:00
AlexOn1ine
fd0766c7fa 17-04-25-master-merge 2025-04-17 14:14:37 +02:00
hedara90
7a35f35352
Make generated files match the current formatting (#6636) 2025-04-17 13:38:30 +02:00
RoamerX
5e294d29da 遗漏招式对照表补全、move_info文件更新
腾讯文档同步更新
2025-04-17 00:13:24 +08:00
RoamerX
7b577a0599 Merge branch 'rh-hideout-master' 2025-04-15 22:21:49 +08:00
RoamerX
dfd0ceb011 翻译修正微调
盒子、属性等
2025-04-15 22:19:40 +08: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
sayseong
8ff081655a Update union_room.h 2025-04-15 21:37:39 +08:00
RoamerX
07bf502b5c
Merge pull request #28 from Wokann/pokeemerald-expansion-chinese
参赛招唤文本汉化
2025-04-15 01:24:27 +08:00
RoamerX
011a62a38c 根据2011版汉化文本修正所有脚本中的文本错误及译名 2025-04-15 01:18:41 +08:00