3041 Commits

Author SHA1 Message Date
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
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
edf7c67775
Remove non-volatile status EFFECTs (#6772) 2025-05-16 22:52:51 +02: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
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
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
spindrift64
38cd80760b
Gen 1 no recharge on KO (#6869) 2025-05-16 08:09:18 +02:00
Eduardo Quezada
3056909286
Added weather accuracy move flags (#6857) 2025-05-16 07:58:40 +02:00
AlexOn1ine
35dff24c9b Master to upcoming merge 2025-05-15 20:37:27 +02:00
Alex
44d9b9c9e6
Further moveend changes (move blocks) (#6820) 2025-05-15 12:43:50 +02:00
Alex
a086d5f592
Reverts wrongly done gem fix and renames struggle effect (#6806) 2025-05-15 10:45:48 +02:00
kittenchilly
4474bd5b80
Add move description data for Z-Moves and Max/G-Max moves (#6852) 2025-05-15 10:44:09 +02:00
GriffinR
929bc8b990 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2025-05-14 11:50:11 -04:00
Eduardo Quezada
3ef61e6451
Combined type-enhancing hold effects (#6846) 2025-05-14 13:45:08 +02:00
Martin Griffin
484c41c49d Remove files that should not have been committed 2025-05-13 14:56:31 +01:00
Eduardo Quezada
face37e8f3
Battle TV expansion (#6826) 2025-05-13 15:54:54 +02:00
Hedara
1abfa7acfa Merge branch 'master' into master-upcoming
Conflicts:
	include/battle.h
	include/constants/battle_string_ids.h
	src/battle_ai_util.c
	src/battle_main.c
	src/battle_util.c
	test/battle/ai/ai.c
2025-05-12 18:21:35 +02:00
Alex
d00563d830
Changed White Herb hold effect name (#6815) 2025-05-11 11:34:47 +02:00
Alex
2044bea883
Rename battlerId to battler for consistency (#2126) 2025-05-09 12:43:23 +01:00
RoamerX
6c675f1945 大批量文本修正
包括所有馆主、四天王、米可利和大吾的(除电话外的)文本,基本参照神百,部分自己额外润色
所有城市介绍牌子以及道馆馆主的文字
“做为”修正为“作为”,“从新”修正为“重新”
以及少量其他部分修正
2025-05-08 00:08:23 +08:00
RoamerX
94e7f69fd3 批量文本修正
包括“携带”与“持有”,“碰到/上”与“遇到”,所有等级以及秘传招式相关的表述
统一学习器内容说明相关的文本
统一开拓区的两种等级的译名
将电视文本中的“酱油众”修正为“粉丝们”
修正了禁止参加名单的PM的展示(修改了一小部分代码)
2025-05-07 16:06:22 +08:00
RoamerX
88fe5e672b 修正几个easychat的词语组合错误
把几个错误的“我是”修正为“我”
调整excel格式,规范py文件并上传
2025-05-06 23:24:26 +08:00
RoamerX
38e4268eaa 以对战开拓区为主的大批量文本修正
以下修改均参照正作目前的使用习惯:
对战开拓区及一些其他设施服务人员的称呼由“你”改为“您”
润色对战开拓区相关的大量脚本文本
将“中断”挑战修改为“暂停”挑战
将“对战房间”修改为“对战间”
将“保存”“存档”等文字修改为“记录”并润色所在句子
主菜单的“导航”和“保存”改为“宝可导航”和“记录”
更正剧情中宝可导航登记语句的格式
修复个别语句错误
2025-05-06 22:03:17 +08:00
RoamerX
df81b368a1 EasyChat选词A-Z模式改为按拼音排序 2025-05-05 21:13:27 +08:00
RoamerX
b151869a6a
Merge pull request #43 from rh-hideout/master
UPDATE MASTER
2025-05-05 16:49:33 +08:00
RoamerX
48f3a4d8ed EasyChat汉化
汉化了原本的单词,根据使用需求替换了其中一部分的单词
按照新的单词表重拼了所有游戏中使用了EasyChat的NPC对话
显示方式目前仍保留了原本的三个一行,单词之间一个空格的格式
2025-05-04 23:07:16 +08:00
PCG
904b399a81
Added Egg Moves for Basculin White Striped (#6769) 2025-05-04 11:43:57 +02:00
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